diff --git a/apollo-adminservice/pom.xml b/apollo-adminservice/pom.xml index a44adc60af3..62684039176 100644 --- a/apollo-adminservice/pom.xml +++ b/apollo-adminservice/pom.xml @@ -130,6 +130,9 @@ ${project.basedir}/src/main/docker docker-hub + + ${project.version} + / diff --git a/apollo-adminservice/src/main/docker/Dockerfile b/apollo-adminservice/src/main/docker/Dockerfile index 9fc3b2518ec..54ce21d3e76 100755 --- a/apollo-adminservice/src/main/docker/Dockerfile +++ b/apollo-adminservice/src/main/docker/Dockerfile @@ -4,24 +4,36 @@ # 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 -MAINTAINER ameizi +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 + +ARG VERSION +ENV VERSION $VERSION + +COPY apollo-adminservice-${VERSION}-github.zip /apollo-adminservice/apollo-adminservice-${VERSION}-github.zip + +RUN unzip /apollo-adminservice/apollo-adminservice-${VERSION}-github.zip -d /apollo-adminservice \ + && 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" ENV APOLLO_RUN_MODE "Docker" -ENV VERSION 1.9.0-SNAPSHOT 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 unzip curl bash tzdata \ + && apk add --no-cache procps curl bash tzdata \ && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ && echo "Asia/Shanghai" > /etc/timezone -ADD apollo-adminservice-${VERSION}-github.zip /apollo-adminservice/apollo-adminservice-${VERSION}-github.zip - -RUN unzip /apollo-adminservice/apollo-adminservice-${VERSION}-github.zip -d /apollo-adminservice \ - && rm -rf /apollo-adminservice/apollo-adminservice-${VERSION}-github.zip \ - && chmod +x /apollo-adminservice/scripts/startup.sh +COPY --from=0 /apollo-adminservice /apollo-adminservice EXPOSE $SERVER_PORT diff --git a/apollo-configservice/pom.xml b/apollo-configservice/pom.xml index 297574cee1f..1572934db86 100644 --- a/apollo-configservice/pom.xml +++ b/apollo-configservice/pom.xml @@ -140,6 +140,9 @@ ${project.basedir}/src/main/docker docker-hub + + ${project.version} + / diff --git a/apollo-configservice/src/main/docker/Dockerfile b/apollo-configservice/src/main/docker/Dockerfile index 2e80584c187..192dbcada5d 100755 --- a/apollo-configservice/src/main/docker/Dockerfile +++ b/apollo-configservice/src/main/docker/Dockerfile @@ -4,24 +4,36 @@ # 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 -MAINTAINER ameizi +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 + +ARG VERSION +ENV VERSION $VERSION + +COPY apollo-configservice-${VERSION}-github.zip /apollo-configservice/apollo-configservice-${VERSION}-github.zip + +RUN unzip /apollo-configservice/apollo-configservice-${VERSION}-github.zip -d /apollo-configservice \ + && 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" ENV APOLLO_RUN_MODE "Docker" -ENV VERSION 1.9.0-SNAPSHOT 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 unzip curl bash tzdata \ + && apk add --no-cache procps curl bash tzdata \ && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ && echo "Asia/Shanghai" > /etc/timezone -ADD apollo-configservice-${VERSION}-github.zip /apollo-configservice/apollo-configservice-${VERSION}-github.zip - -RUN unzip /apollo-configservice/apollo-configservice-${VERSION}-github.zip -d /apollo-configservice \ - && rm -rf /apollo-configservice/apollo-configservice-${VERSION}-github.zip \ - && chmod +x /apollo-configservice/scripts/startup.sh +COPY --from=0 /apollo-configservice /apollo-configservice EXPOSE $SERVER_PORT diff --git a/apollo-portal/pom.xml b/apollo-portal/pom.xml index e8be1f2a5f9..2c51c92bad4 100644 --- a/apollo-portal/pom.xml +++ b/apollo-portal/pom.xml @@ -120,6 +120,9 @@ ${project.basedir}/src/main/docker docker-hub + + ${project.version} + / diff --git a/apollo-portal/src/main/docker/Dockerfile b/apollo-portal/src/main/docker/Dockerfile index 7b63342acdf..dbddabb8270 100755 --- a/apollo-portal/src/main/docker/Dockerfile +++ b/apollo-portal/src/main/docker/Dockerfile @@ -4,24 +4,36 @@ # 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 -MAINTAINER ameizi +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 + +ARG VERSION +ENV VERSION $VERSION + +COPY apollo-portal-${VERSION}-github.zip /apollo-portal/apollo-portal-${VERSION}-github.zip + +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" ENV APOLLO_RUN_MODE "Docker" -ENV VERSION 1.9.0-SNAPSHOT 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 unzip curl bash tzdata \ + && apk add --no-cache procps curl bash tzdata \ && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ && echo "Asia/Shanghai" > /etc/timezone -ADD apollo-portal-${VERSION}-github.zip /apollo-portal/apollo-portal-${VERSION}-github.zip - -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 +COPY --from=0 /apollo-portal /apollo-portal EXPOSE $SERVER_PORT