This is an automated email from the ASF dual-hosted git repository. hanahmily pushed a commit to branch docker-jre in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 8d296c4136ca103973413009a659267c85cd6375 Author: Gao Hongtao <[email protected]> AuthorDate: Wed Sep 8 19:14:51 2021 +0800 Use the jre image as the base image Signed-off-by: Gao Hongtao <[email protected]> --- 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 dd44a66..8861a0b 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 d2f9f54..7a78061 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 " \
