diff --git a/CHANGES.md b/CHANGES.md index 36552da5bf0..fe43952a169 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,5 +17,6 @@ Apollo 2.1.0 * [Allow users to associate multiple public namespaces at a time](https://github.com/apolloconfig/apollo/pull/4437) * [Move apollo-demo, scripts/docker-quick-start and scripts/apollo-on-kubernetes out of main repository](https://github.com/apolloconfig/apollo/pull/4440) * [Add search key when comparing Configuration items](https://github.com/apolloconfig/apollo/pull/4459) +* [fix(#4474):'openjdk:8-jre-alpine' potentially causing wrong number of cpu cores](https://github.com/apolloconfig/apollo/pull/4475) ------------------ All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/11?closed=1) diff --git a/apollo-adminservice/src/main/docker/Dockerfile b/apollo-adminservice/src/main/docker/Dockerfile index bc49cb1dd07..95d4472fb30 100755 --- a/apollo-adminservice/src/main/docker/Dockerfile +++ b/apollo-adminservice/src/main/docker/Dockerfile @@ -18,13 +18,7 @@ # 2. Build with: mvn docker:build -pl apollo-adminservice # 3. Run with: docker run -p 8090:8090 -e SPRING_DATASOURCE_URL="jdbc:mysql://fill-in-the-correct-server:3306/ApolloConfigDB?characterEncoding=utf8" -e SPRING_DATASOURCE_USERNAME=FillInCorrectUser -e SPRING_DATASOURCE_PASSWORD=FillInCorrectPassword -d -v /tmp/logs:/opt/logs --name apollo-adminservice apolloconfig/apollo-adminservice -FROM openjdk:8-jre-alpine -LABEL maintainer="finchcn@gmail.com;ameizi" - -RUN echo "http://mirrors.aliyun.com/alpine/v3.8/main" > /etc/apk/repositories \ - && echo "http://mirrors.aliyun.com/alpine/v3.8/community" >> /etc/apk/repositories \ - && apk update upgrade \ - && apk add --no-cache unzip +FROM alpine:3.15.5 ARG VERSION ENV VERSION $VERSION @@ -35,16 +29,16 @@ RUN unzip /apollo-adminservice/apollo-adminservice-${VERSION}-github.zip -d /apo && rm -rf /apollo-adminservice/apollo-adminservice-${VERSION}-github.zip \ && chmod +x /apollo-adminservice/scripts/startup.sh -FROM openjdk:8-jre-alpine -LABEL maintainer="finchcn@gmail.com;ameizi" +FROM openjdk:8-jre-slim +LABEL maintainer="g632104866@gmail.com;finchcn@gmail.com;ameizi" ENV APOLLO_RUN_MODE "Docker" ENV SERVER_PORT 8090 -RUN echo "http://mirrors.aliyun.com/alpine/v3.8/main" > /etc/apk/repositories \ - && echo "http://mirrors.aliyun.com/alpine/v3.8/community" >> /etc/apk/repositories \ - && apk update upgrade \ - && apk add --no-cache procps curl bash tzdata \ +RUN echo "deb http://mirrors.aliyun.com/debian/ bullseye main non-free contrib" > /etc/apt/sources.list \ + && echo "deb http://mirrors.aliyun.com/debian-security/ bullseye-security main" >> /etc/apt/sources.list \ + && apt-get update \ + && apt-get install -y --no-install-recommends procps curl bash tzdata \ && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ && echo "Asia/Shanghai" > /etc/timezone diff --git a/apollo-configservice/src/main/docker/Dockerfile b/apollo-configservice/src/main/docker/Dockerfile index 977c976eb0d..c54617b9909 100755 --- a/apollo-configservice/src/main/docker/Dockerfile +++ b/apollo-configservice/src/main/docker/Dockerfile @@ -18,13 +18,7 @@ # 2. Build with: mvn docker:build -pl apollo-configservice # 3. Run with: docker run -p 8080:8080 -e SPRING_DATASOURCE_URL="jdbc:mysql://fill-in-the-correct-server:3306/ApolloConfigDB?characterEncoding=utf8" -e SPRING_DATASOURCE_USERNAME=FillInCorrectUser -e SPRING_DATASOURCE_PASSWORD=FillInCorrectPassword -d -v /tmp/logs:/opt/logs --name apollo-configservice apolloconfig/apollo-configservice -FROM openjdk:8-jre-alpine -LABEL maintainer="finchcn@gmail.com;ameizi" - -RUN echo "http://mirrors.aliyun.com/alpine/v3.8/main" > /etc/apk/repositories \ - && echo "http://mirrors.aliyun.com/alpine/v3.8/community" >> /etc/apk/repositories \ - && apk update upgrade \ - && apk add --no-cache unzip +FROM alpine:3.15.5 ARG VERSION ENV VERSION $VERSION @@ -35,16 +29,16 @@ RUN unzip /apollo-configservice/apollo-configservice-${VERSION}-github.zip -d /a && rm -rf /apollo-configservice/apollo-configservice-${VERSION}-github.zip \ && chmod +x /apollo-configservice/scripts/startup.sh -FROM openjdk:8-jre-alpine -LABEL maintainer="finchcn@gmail.com;ameizi" +FROM openjdk:8-jre-slim +LABEL maintainer="g632104866@gmail.com;finchcn@gmail.com;ameizi" ENV APOLLO_RUN_MODE "Docker" ENV SERVER_PORT 8080 -RUN echo "http://mirrors.aliyun.com/alpine/v3.8/main" > /etc/apk/repositories \ - && echo "http://mirrors.aliyun.com/alpine/v3.8/community" >> /etc/apk/repositories \ - && apk update upgrade \ - && apk add --no-cache procps curl bash tzdata \ +RUN echo "deb http://mirrors.aliyun.com/debian/ bullseye main non-free contrib" > /etc/apt/sources.list \ + && echo "deb http://mirrors.aliyun.com/debian-security/ bullseye-security main" >> /etc/apt/sources.list \ + && apt-get update \ + && apt-get install -y --no-install-recommends procps curl bash tzdata \ && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ && echo "Asia/Shanghai" > /etc/timezone diff --git a/apollo-portal/src/main/docker/Dockerfile b/apollo-portal/src/main/docker/Dockerfile index 0924c70674d..19906753caa 100755 --- a/apollo-portal/src/main/docker/Dockerfile +++ b/apollo-portal/src/main/docker/Dockerfile @@ -18,13 +18,7 @@ # 2. Build with: mvn docker:build -pl apollo-portal # 3. Run with: docker run -p 8070:8070 -e SPRING_DATASOURCE_URL="jdbc:mysql://fill-in-the-correct-server:3306/ApolloPortalDB?characterEncoding=utf8" -e SPRING_DATASOURCE_USERNAME=FillInCorrectUser -e SPRING_DATASOURCE_PASSWORD=FillInCorrectPassword -e APOLLO_PORTAL_ENVS=dev,pro -e DEV_META=http://fill-in-dev-meta-server:8080 -e PRO_META=http://fill-in-pro-meta-server:8080 -d -v /tmp/logs:/opt/logs --name apollo-portal apolloconfig/apollo-portal -FROM openjdk:8-jre-alpine -LABEL maintainer="finchcn@gmail.com;ameizi" - -RUN echo "http://mirrors.aliyun.com/alpine/v3.8/main" > /etc/apk/repositories \ - && echo "http://mirrors.aliyun.com/alpine/v3.8/community" >> /etc/apk/repositories \ - && apk update upgrade \ - && apk add --no-cache unzip +FROM alpine:3.15.5 ARG VERSION ENV VERSION $VERSION @@ -35,16 +29,16 @@ RUN unzip /apollo-portal/apollo-portal-${VERSION}-github.zip -d /apollo-portal \ && rm -rf /apollo-portal/apollo-portal-${VERSION}-github.zip \ && chmod +x /apollo-portal/scripts/startup.sh -FROM openjdk:8-jre-alpine -LABEL maintainer="finchcn@gmail.com;ameizi" +FROM openjdk:8-jre-slim +LABEL maintainer="g632104866@gmail.com;finchcn@gmail.com;ameizi" ENV APOLLO_RUN_MODE "Docker" ENV SERVER_PORT 8070 -RUN echo "http://mirrors.aliyun.com/alpine/v3.8/main" > /etc/apk/repositories \ - && echo "http://mirrors.aliyun.com/alpine/v3.8/community" >> /etc/apk/repositories \ - && apk update upgrade \ - && apk add --no-cache procps curl bash tzdata \ +RUN echo "deb http://mirrors.aliyun.com/debian/ bullseye main non-free contrib" > /etc/apt/sources.list \ + && echo "deb http://mirrors.aliyun.com/debian-security/ bullseye-security main" >> /etc/apt/sources.list \ + && apt-get update \ + && apt-get install -y --no-install-recommends procps curl bash tzdata \ && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ && echo "Asia/Shanghai" > /etc/timezone