[#noissue] add version change in flink
This commit is contained in:
parent
23a3a8a7a7
commit
c8a0edf3be
|
@ -252,6 +252,9 @@ services:
|
||||||
build:
|
build:
|
||||||
context: pinpoint-flink
|
context: pinpoint-flink
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
|
args:
|
||||||
|
- PINPOINT_VERSION=${PINPOINT_VERSION}
|
||||||
|
|
||||||
container_name: "${PINPOINT_FLINK_NAME}-jobmanager"
|
container_name: "${PINPOINT_FLINK_NAME}-jobmanager"
|
||||||
image: "pinpointdocker/pinpoint-flink:${PINPOINT_VERSION}"
|
image: "pinpointdocker/pinpoint-flink:${PINPOINT_VERSION}"
|
||||||
expose:
|
expose:
|
||||||
|
@ -271,8 +274,11 @@ services:
|
||||||
build:
|
build:
|
||||||
context: pinpoint-flink
|
context: pinpoint-flink
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
|
args:
|
||||||
|
- PINPOINT_VERSION=${PINPOINT_VERSION}
|
||||||
|
|
||||||
container_name: "${PINPOINT_FLINK_NAME}-taskmanager"
|
container_name: "${PINPOINT_FLINK_NAME}-taskmanager"
|
||||||
image: ${PINPOINT_FLINK_NAME}-flink:dev
|
image: "pinpointdocker/pinpoint-flink:${PINPOINT_VERSION}"
|
||||||
expose:
|
expose:
|
||||||
- "6121"
|
- "6121"
|
||||||
- "6122"
|
- "6122"
|
||||||
|
|
|
@ -1,10 +1,15 @@
|
||||||
FROM flink:1.7
|
FROM flink:1.7
|
||||||
ARG PINPOINT_VERSION=2.2.0
|
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.2.2}
|
||||||
|
ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-flink-job-${PINPOINT_VERSION}.jar
|
||||||
|
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get install --no-install-recommends -y zip \
|
&& apt-get install --no-install-recommends -y zip \
|
||||||
&& apt-get clean \
|
&& apt-get clean \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/* \
|
||||||
ADD https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-flink-job-${PINPOINT_VERSION}.jar /build/
|
&& mkdir -p /build \
|
||||||
|
&& curl -SL ${INSTALL_URL} -o /build/pinpoint-flink-job.jar
|
||||||
|
|
||||||
COPY build/ /build/
|
COPY build/ /build/
|
||||||
COPY docker-bin/ /docker-bin/
|
COPY docker-bin/ /docker-bin/
|
||||||
ENTRYPOINT ["/docker-bin/docker-entrypoint.sh"]
|
ENTRYPOINT ["/docker-bin/docker-entrypoint.sh"]
|
||||||
|
|
||||||
|
|
|
@ -3,12 +3,12 @@
|
||||||
# In flink version < 1.11 we can't use "job cluster" because it's not yet available
|
# In flink version < 1.11 we can't use "job cluster" because it's not yet available
|
||||||
if [ "$1" = "standalone-job" ]; then
|
if [ "$1" = "standalone-job" ]; then
|
||||||
cd /build
|
cd /build
|
||||||
zip -d pinpoint-flink-job-*.jar "profiles/release/*.properties"
|
zip -d pinpoint-flink-job.jar "profiles/release/*.properties"
|
||||||
sed -i -e "s/#PINPOINT_ZOOKEEPER_ADDRESS#/${PINPOINT_ZOOKEEPER_ADDRESS}/g" profiles/release/*
|
sed -i -e "s/#PINPOINT_ZOOKEEPER_ADDRESS#/${PINPOINT_ZOOKEEPER_ADDRESS}/g" profiles/release/*
|
||||||
zip -r pinpoint-flink-job-*.jar profiles/
|
zip -r pinpoint-flink-job.jar profiles/
|
||||||
cd -
|
cd -
|
||||||
|
|
||||||
mv /build/pinpoint-flink-job-*.jar pinpoint-flink-job.jar
|
mv /build/pinpoint-flink-job.jar pinpoint-flink-job.jar
|
||||||
|
|
||||||
shift
|
shift
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue