From 6a0be5c239362121152adfc86eb6cd7d60eda604 Mon Sep 17 00:00:00 2001 From: yangjd33 Date: Fri, 10 Mar 2023 11:31:41 +0800 Subject: [PATCH] feat(docker):Add the jattach tool to the docker container that starts the java service process #7538 --- docker/datahub-frontend/Dockerfile | 3 ++- docker/datahub-gms/Dockerfile | 1 + docker/datahub-mae-consumer/Dockerfile | 3 ++- docker/datahub-mce-consumer/Dockerfile | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docker/datahub-frontend/Dockerfile b/docker/datahub-frontend/Dockerfile index 15abf77b89245..74db635aa0066 100644 --- a/docker/datahub-frontend/Dockerfile +++ b/docker/datahub-frontend/Dockerfile @@ -8,7 +8,8 @@ RUN addgroup -S datahub && adduser -S datahub -G datahub # Upgrade Alpine and base packages RUN apk --no-cache --update-cache --available upgrade \ && apk --no-cache add curl \ - && apk --no-cache add openjdk11-jre --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community + && apk --no-cache add openjdk11-jre --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \ + && apk --no-cache add jattach --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ FROM base as prod-install diff --git a/docker/datahub-gms/Dockerfile b/docker/datahub-gms/Dockerfile index f26774c8e4b88..769b2fcafb56a 100644 --- a/docker/datahub-gms/Dockerfile +++ b/docker/datahub-gms/Dockerfile @@ -18,6 +18,7 @@ FROM alpine:3 AS base RUN apk --no-cache --update-cache --available upgrade \ && apk --no-cache add curl bash coreutils gcompat \ && apk --no-cache add openjdk11-jre --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \ + && apk --no-cache add jattach --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ \ && curl -sS https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-runner/9.4.46.v20220331/jetty-runner-9.4.46.v20220331.jar --output jetty-runner.jar \ && curl -sS https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-jmx/9.4.46.v20220331/jetty-jmx-9.4.46.v20220331.jar --output jetty-jmx.jar \ && curl -sS https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/9.4.46.v20220331/jetty-util-9.4.46.v20220331.jar --output jetty-util.jar \ diff --git a/docker/datahub-mae-consumer/Dockerfile b/docker/datahub-mae-consumer/Dockerfile index 5ca3c8176d5c2..d9c8047e6835f 100644 --- a/docker/datahub-mae-consumer/Dockerfile +++ b/docker/datahub-mae-consumer/Dockerfile @@ -18,6 +18,7 @@ FROM alpine:3 AS base RUN apk --no-cache --update-cache --available upgrade \ && apk --no-cache add curl bash coreutils \ && apk --no-cache add openjdk11-jre --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \ + && apk --no-cache add jattach --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ \ && wget --no-verbose https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.18.0/opentelemetry-javaagent.jar \ && wget --no-verbose https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.17.2/jmx_prometheus_javaagent-0.17.2.jar -O jmx_prometheus_javaagent.jar \ && cp /usr/lib/jvm/java-11-openjdk/jre/lib/security/cacerts /tmp/kafka.client.truststore.jks @@ -46,4 +47,4 @@ EXPOSE 9090 HEALTHCHECK --start-period=2m --retries=4 CMD curl --fail http://localhost:9091/actuator/health || exit 1 -CMD /datahub/datahub-mae-consumer/scripts/start.sh \ No newline at end of file +CMD /datahub/datahub-mae-consumer/scripts/start.sh diff --git a/docker/datahub-mce-consumer/Dockerfile b/docker/datahub-mce-consumer/Dockerfile index 09ca7b914366c..7755851065291 100644 --- a/docker/datahub-mce-consumer/Dockerfile +++ b/docker/datahub-mce-consumer/Dockerfile @@ -18,6 +18,7 @@ FROM alpine:3 AS base RUN apk --no-cache --update-cache --available upgrade \ && apk --no-cache add curl bash \ && apk --no-cache add openjdk11-jre --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \ + && apk --no-cache add jattach --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ \ && wget --no-verbose https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.18.0/opentelemetry-javaagent.jar \ && wget --no-verbose https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.17.2/jmx_prometheus_javaagent-0.17.2.jar -O jmx_prometheus_javaagent.jar \ && cp /usr/lib/jvm/java-11-openjdk/jre/lib/security/cacerts /tmp/kafka.client.truststore.jks @@ -46,4 +47,4 @@ EXPOSE 9090 HEALTHCHECK --start-period=2m --retries=4 CMD curl --fail http://localhost:9090/actuator/health || exit 1 -CMD /datahub/datahub-mce-consumer/scripts/start.sh \ No newline at end of file +CMD /datahub/datahub-mce-consumer/scripts/start.sh