From 8d296c4136ca103973413009a659267c85cd6375 Mon Sep 17 00:00:00 2001 From: Gao Hongtao Date: Wed, 8 Sep 2021 19:14:51 +0800 Subject: [PATCH 1/4] Use the jre image as the base image Signed-off-by: Gao Hongtao --- docker/oap/Dockerfile.oap | 22 ++++------------------ docker/ui/Dockerfile.ui | 2 +- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/docker/oap/Dockerfile.oap b/docker/oap/Dockerfile.oap index dd44a6617e08..8861a0b884da 100644 --- a/docker/oap/Dockerfile.oap +++ b/docker/oap/Dockerfile.oap @@ -14,28 +14,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG BASE_IMAGE='adoptopenjdk/openjdk11:alpine' +ARG BASE_IMAGE='adoptopenjdk/openjdk11:alpine-jre' -FROM golang:1.14 AS cli - -ARG COMMIT_HASH=9f267876493943716434fdaa30047a14c0b5b2d9 -ARG CLI_CODE=${COMMIT_HASH}.tar.gz -ARG CLI_CODE_URL=https://github.com/apache/skywalking-cli/archive/${CLI_CODE} - -ENV CGO_ENABLED=0 -ENV GO111MODULE=on - -WORKDIR /cli - -ADD ${CLI_CODE_URL} . -RUN tar -xf ${CLI_CODE} --strip 1 -RUN rm ${CLI_CODE} - -RUN mkdir -p /skywalking/bin/ -RUN make linux && mv bin/swctl-latest-linux-amd64 /skywalking/bin/swctl +FROM apache/skywalking-base:8.7.0-es7 AS cli FROM $BASE_IMAGE +RUN apk add --no-cache openssl + ENV JAVA_OPTS=" -Xms256M " \ SW_CLUSTER="standalone" \ SW_STORAGE="h2" diff --git a/docker/ui/Dockerfile.ui b/docker/ui/Dockerfile.ui index d2f9f54de8be..7a7806113ed4 100644 --- a/docker/ui/Dockerfile.ui +++ b/docker/ui/Dockerfile.ui @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM adoptopenjdk/openjdk11:alpine +FROM adoptopenjdk/openjdk11:alpine-jre ENV DIST_NAME=apache-skywalking-apm-bin \ JAVA_OPTS=" -Xms256M " \ From e211e86503df77f35365102997ad8c9026dc43d2 Mon Sep 17 00:00:00 2001 From: Gao Hongtao Date: Wed, 8 Sep 2021 19:19:02 +0800 Subject: [PATCH 2/4] Update Change logs Signed-off-by: Gao Hongtao --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 0eb427e04114..540ac79a7d88 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -59,6 +59,7 @@ Release Notes. * Fix ElasticSearch storage plugin doesn't work when hot reloading from `secretsManagementFile`. * Support etcd grouped dynamic configurations. * Unified the config word `namespace` in the project. +* Switch JRE base image for dev images. #### UI From 828e4e089c1ee7351512e9700eb13668d75e47da Mon Sep 17 00:00:00 2001 From: Gao Hongtao Date: Wed, 8 Sep 2021 19:42:30 +0800 Subject: [PATCH 3/4] Ignore errors when installing openssl Signed-off-by: Gao Hongtao --- docker/oap/Dockerfile.oap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/oap/Dockerfile.oap b/docker/oap/Dockerfile.oap index 8861a0b884da..ba36df52d46a 100644 --- a/docker/oap/Dockerfile.oap +++ b/docker/oap/Dockerfile.oap @@ -20,7 +20,7 @@ FROM apache/skywalking-base:8.7.0-es7 AS cli FROM $BASE_IMAGE -RUN apk add --no-cache openssl +RUN apk add --no-cache openssl || true ENV JAVA_OPTS=" -Xms256M " \ SW_CLUSTER="standalone" \ From d852728faf3ab9f2228d468c74374a838db0954e Mon Sep 17 00:00:00 2001 From: Gao Hongtao Date: Wed, 8 Sep 2021 19:49:45 +0800 Subject: [PATCH 4/4] Update base images of test cases Signed-off-by: Gao Hongtao --- .github/workflows/e2e.istio.yaml | 2 +- .github/workflows/e2e.jdk-versions.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e.istio.yaml b/.github/workflows/e2e.istio.yaml index 74f9fcfcd360..e86494989bec 100644 --- a/.github/workflows/e2e.istio.yaml +++ b/.github/workflows/e2e.istio.yaml @@ -28,7 +28,7 @@ env: SKIP_TEST: true TAG: ${{ github.sha }} SCRIPTS_DIR: test/e2e-mesh/e2e-istio/scripts - SW_OAP_BASE_IMAGE: openjdk:11-jdk + SW_OAP_BASE_IMAGE: adoptopenjdk/openjdk11:alpine-jre SW_KUBERNETES_COMMIT_SHA: 6d5897616ce30ebb1706c0cf566ac36f733d93e0 concurrency: diff --git a/.github/workflows/e2e.jdk-versions.yaml b/.github/workflows/e2e.jdk-versions.yaml index f86519572040..427f2d1a09a1 100644 --- a/.github/workflows/e2e.jdk-versions.yaml +++ b/.github/workflows/e2e.jdk-versions.yaml @@ -37,7 +37,7 @@ jobs: env: SW_SIMPLE_CASE: jdk SW_AGENT_JDK_VERSION: ${{ matrix.jdk }} - SW_OAP_BASE_IMAGE: adoptopenjdk/openjdk${{ matrix.jdk }}:alpine + SW_OAP_BASE_IMAGE: adoptopenjdk/openjdk${{ matrix.jdk }}:alpine-jre steps: - uses: actions/checkout@v2 with: