forked from apolloconfig/apollo
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(apolloconfig#4474):'openjdk:8-jre-alpine' potentially causing wro…
…ng number of cpu cores
- Loading branch information
Showing
3 changed files
with
21 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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="[email protected];ameizi<[email protected]>" | ||
|
|
||
| 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="[email protected];ameizi<[email protected]>" | ||
| FROM openjdk:8-jre-slim | ||
| LABEL maintainer="[email protected];[email protected];ameizi<[email protected]>" | ||
|
|
||
| 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 | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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="[email protected];ameizi<[email protected]>" | ||
|
|
||
| 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="[email protected];ameizi<[email protected]>" | ||
| FROM openjdk:8-jre-slim | ||
| LABEL maintainer="[email protected];[email protected];ameizi<[email protected]>" | ||
|
|
||
| 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 | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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="[email protected];ameizi<[email protected]>" | ||
|
|
||
| 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="[email protected];ameizi<[email protected]>" | ||
| FROM openjdk:8-jre-slim | ||
| LABEL maintainer="[email protected];[email protected];ameizi<[email protected]>" | ||
|
|
||
| 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 | ||
|
|
||
|
|
||