From 1a0cb7a45f7125e7c5d1d2f595301c492a01e5ae Mon Sep 17 00:00:00 2001 From: shanhongyu Date: Fri, 14 Jun 2019 15:30:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=E5=B0=86=E6=9C=8D=E5=8A=A1=E7=AB=AF?= =?UTF-8?q?=E5=8F=A3=E6=8F=90=E5=8F=96=E5=88=B0docker=20run=E7=9A=84=20-e?= =?UTF-8?q?=20SERVER=5FPORT=20=E5=8F=AF=E6=8C=87=E5=AE=9A=EF=BC=8C?= =?UTF-8?q?=E5=9C=A8docker=E9=9C=80=E8=A6=81=E4=BD=BF=E7=94=A8host?= =?UTF-8?q?=E7=BD=91=E7=BB=9C=E6=97=B6=EF=BC=8C=E5=8F=AF=E4=BB=A5=E4=B8=8D?= =?UTF-8?q?=E7=94=A8=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E7=AB=AF=E5=8F=A3=EF=BC=8C=E9=81=BF=E5=85=8D=E4=B8=8E=E5=AE=BF?= =?UTF-8?q?=E4=B8=BB=E6=9C=BA=E4=B8=8A=E7=9A=84=E5=8E=9F=E6=9C=89=E7=AB=AF?= =?UTF-8?q?=E5=8F=A3=E5=8D=A0=E7=94=A8=E5=86=B2=E7=AA=81=202.=E5=AF=B9dock?= =?UTF-8?q?er=20CMD=E5=85=A5=E5=8F=A3=E7=9A=84startup.sh=E6=96=87=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=8F=AF=E6=89=A7=E8=A1=8C=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E6=8C=87=E4=BB=A4=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=9C=A8?= =?UTF-8?q?=E6=9F=90=E4=BA=9B=E6=97=B6=E5=80=99=E8=AF=A5=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E8=A2=AB=E6=89=93=E5=8C=85=E8=BF=9B=E5=85=A5=E5=90=8E=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=89=A7=E8=A1=8C=E6=9D=83=E9=99=90=E7=9A=84=E9=BA=BB?= =?UTF-8?q?=E7=83=A6=EF=BC=88=E5=B7=B2=E5=AE=9E=E9=99=85=E9=81=87=E5=88=B0?= =?UTF-8?q?=EF=BC=8C=E5=8F=88=E5=9B=9E=E5=A4=B4=E9=87=8D=E6=96=B0=E6=89=93?= =?UTF-8?q?=E5=8C=85=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apollo-adminservice/src/main/docker/Dockerfile | 4 +++- apollo-adminservice/src/main/scripts/startup.sh | 3 ++- apollo-configservice/src/main/docker/Dockerfile | 4 +++- apollo-configservice/src/main/scripts/startup.sh | 3 ++- apollo-portal/src/main/docker/Dockerfile | 4 +++- apollo-portal/src/main/scripts/startup.sh | 3 ++- 6 files changed, 15 insertions(+), 6 deletions(-) diff --git a/apollo-adminservice/src/main/docker/Dockerfile b/apollo-adminservice/src/main/docker/Dockerfile index ce24cd77048..4dee483737e 100755 --- a/apollo-adminservice/src/main/docker/Dockerfile +++ b/apollo-adminservice/src/main/docker/Dockerfile @@ -7,6 +7,7 @@ FROM openjdk:8-jre-alpine MAINTAINER ameizi ENV VERSION 1.5.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 \ @@ -20,8 +21,9 @@ ADD apollo-adminservice-${VERSION}-github.zip /apollo-adminservice/apollo-admins RUN unzip /apollo-adminservice/apollo-adminservice-${VERSION}-github.zip -d /apollo-adminservice \ && rm -rf /apollo-adminservice/apollo-adminservice-${VERSION}-github.zip \ && sed -i '$d' /apollo-adminservice/scripts/startup.sh \ + && chmod +x /apollo-adminservice/scripts/startup.sh \ && echo "tail -f /dev/null" >> /apollo-adminservice/scripts/startup.sh -EXPOSE 8090 +EXPOSE $SERVER_PORT CMD ["/apollo-adminservice/scripts/startup.sh"] diff --git a/apollo-adminservice/src/main/scripts/startup.sh b/apollo-adminservice/src/main/scripts/startup.sh index a2b91a7a599..6cfe0fb9662 100644 --- a/apollo-adminservice/src/main/scripts/startup.sh +++ b/apollo-adminservice/src/main/scripts/startup.sh @@ -3,7 +3,8 @@ SERVICE_NAME=apollo-adminservice ## Adjust log dir if necessary LOG_DIR=/opt/logs/100003172 ## Adjust server port if necessary -SERVER_PORT=8090 +#SERVER_PORT=8090 +SERVER_PORT=${SERVER_PORT:=8090} ## Create log directory if not existed because JDK 8+ won't do that mkdir -p $LOG_DIR diff --git a/apollo-configservice/src/main/docker/Dockerfile b/apollo-configservice/src/main/docker/Dockerfile index 36e2069a76a..79c41007766 100755 --- a/apollo-configservice/src/main/docker/Dockerfile +++ b/apollo-configservice/src/main/docker/Dockerfile @@ -7,6 +7,7 @@ FROM openjdk:8-jre-alpine MAINTAINER ameizi ENV VERSION 1.5.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 \ @@ -20,8 +21,9 @@ ADD apollo-configservice-${VERSION}-github.zip /apollo-configservice/apollo-conf RUN unzip /apollo-configservice/apollo-configservice-${VERSION}-github.zip -d /apollo-configservice \ && rm -rf /apollo-configservice/apollo-configservice-${VERSION}-github.zip \ && sed -i '$d' /apollo-configservice/scripts/startup.sh \ + && chmod +x /apollo-configservice/scripts/startup.sh \ && echo "tail -f /dev/null" >> /apollo-configservice/scripts/startup.sh -EXPOSE 8080 +EXPOSE $SERVER_PORT CMD ["/apollo-configservice/scripts/startup.sh"] diff --git a/apollo-configservice/src/main/scripts/startup.sh b/apollo-configservice/src/main/scripts/startup.sh index 64908838b06..df77f7202fe 100644 --- a/apollo-configservice/src/main/scripts/startup.sh +++ b/apollo-configservice/src/main/scripts/startup.sh @@ -3,7 +3,8 @@ SERVICE_NAME=apollo-configservice ## Adjust log dir if necessary LOG_DIR=/opt/logs/100003171 ## Adjust server port if necessary -SERVER_PORT=8080 +#SERVER_PORT=8080 +SERVER_PORT=${SERVER_PORT:=8080} ## Create log directory if not existed because JDK 8+ won't do that mkdir -p $LOG_DIR diff --git a/apollo-portal/src/main/docker/Dockerfile b/apollo-portal/src/main/docker/Dockerfile index eca51ea1ed1..cb84d72546f 100755 --- a/apollo-portal/src/main/docker/Dockerfile +++ b/apollo-portal/src/main/docker/Dockerfile @@ -7,6 +7,7 @@ FROM openjdk:8-jre-alpine MAINTAINER ameizi ENV VERSION 1.5.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 \ @@ -20,8 +21,9 @@ ADD apollo-portal-${VERSION}-github.zip /apollo-portal/apollo-portal-${VERSION}- RUN unzip /apollo-portal/apollo-portal-${VERSION}-github.zip -d /apollo-portal \ && rm -rf /apollo-portal/apollo-portal-${VERSION}-github.zip \ && sed -i '$d' /apollo-portal/scripts/startup.sh \ + && chmod +x /apollo-portal/scripts/startup.sh \ && echo "tail -f /dev/null" >> /apollo-portal/scripts/startup.sh -EXPOSE 8070 +EXPOSE $SERVER_PORT CMD ["/apollo-portal/scripts/startup.sh"] diff --git a/apollo-portal/src/main/scripts/startup.sh b/apollo-portal/src/main/scripts/startup.sh index 013bf3c046d..0c9fd36b44c 100755 --- a/apollo-portal/src/main/scripts/startup.sh +++ b/apollo-portal/src/main/scripts/startup.sh @@ -3,7 +3,8 @@ SERVICE_NAME=apollo-portal ## Adjust log dir if necessary LOG_DIR=/opt/logs/100003173 ## Adjust server port if necessary -SERVER_PORT=8070 +#SERVER_PORT=8070 +SERVER_PORT=${SERVER_PORT:=8070} ## Create log directory if not existed because JDK 8+ won't do that mkdir -p $LOG_DIR From 052629d000af3a84499e26440ef769813009d732 Mon Sep 17 00:00:00 2001 From: shanhongyu Date: Mon, 17 Jun 2019 15:38:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1=E3=80=81maven=E7=BC=96=E8=AF=91=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E5=86=8D=E9=9C=80=E8=A6=81=E4=B8=BA=E6=AF=8F=E4=B8=AA?= =?UTF-8?q?config=E7=8E=AF=E5=A2=83=E9=83=BD=E4=BF=AE=E6=94=B9build.sh(bat?= =?UTF-8?q?)=EF=BC=8C=E5=8F=AA=E9=9C=80=E8=A6=81=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E4=B8=80=E6=AC=A1maven=E7=BC=96=E8=AF=91=E3=80=82=E4=B8=80?= =?UTF-8?q?=E6=AC=A1docker=E6=89=93=E5=8C=85=E3=80=82=202=E3=80=81?= =?UTF-8?q?=E5=8E=9F=E6=9C=AC=E9=9C=80=E8=A6=81=E5=86=8Dbuild.sh(bat)?= =?UTF-8?q?=E4=B8=AD=E9=85=8D=E7=BD=AE=E7=9A=84=E5=8F=82=E6=95=B0=20portal?= =?UTF-8?q?=20=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=81config=E5=92=8Cadmin=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=9E=E6=8E=A5=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E3=80=81metaserver=E4=BF=A1=E6=81=AF=EF=BC=8C=E9=83=BD?= =?UTF-8?q?=E5=B0=86=E4=B8=8D=E9=9C=80=E8=A6=81=E4=BA=86=E3=80=82=203?= =?UTF-8?q?=E3=80=81=E8=BF=99=E4=BA=9B=E4=BF=A1=E6=81=AF=EF=BC=8C=E9=83=BD?= =?UTF-8?q?=E6=8F=90=E5=8F=96=E5=88=B0=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E4=B8=AD=E6=9D=A5=E9=85=8D=E7=BD=AE=E3=80=82=E4=B8=8D=E7=AE=A1?= =?UTF-8?q?=E4=BD=A0=E6=98=AF=E6=99=AE=E9=80=9A=E9=83=A8=E7=BD=B2=E8=BF=98?= =?UTF-8?q?=E6=98=AFdocker=E9=83=A8=E7=BD=B2=EF=BC=8C=E9=83=BD=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E9=80=9A=E8=BF=87=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E6=9D=A5=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF=E3=80=82=20?= =?UTF-8?q?=E5=AE=8C=E5=85=A8=E6=9D=9C=E7=BB=9D=E5=90=8C=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E4=B8=8D=E5=90=8C=E5=8C=85=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E7=BC=96=E8=AF=91=EF=BC=8C=E5=A4=9A=E6=AC=A1?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apollo-adminservice/src/main/docker/Dockerfile | 4 ++++ apollo-adminservice/src/main/scripts/startup.sh | 5 +++++ apollo-configservice/src/main/docker/Dockerfile | 4 ++++ apollo-configservice/src/main/scripts/startup.sh | 5 +++++ apollo-portal/src/main/docker/Dockerfile | 10 ++++++++++ apollo-portal/src/main/scripts/startup.sh | 4 ++++ 6 files changed, 32 insertions(+) diff --git a/apollo-adminservice/src/main/docker/Dockerfile b/apollo-adminservice/src/main/docker/Dockerfile index 4dee483737e..af21e2c10ee 100755 --- a/apollo-adminservice/src/main/docker/Dockerfile +++ b/apollo-adminservice/src/main/docker/Dockerfile @@ -8,6 +8,10 @@ MAINTAINER ameizi ENV VERSION 1.5.0-SNAPSHOT ENV SERVER_PORT 8090 +# DataSource Info +ENV DS_URL "" +ENV DS_USERNAME "" +ENV DS_PASSWORD "" 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 \ diff --git a/apollo-adminservice/src/main/scripts/startup.sh b/apollo-adminservice/src/main/scripts/startup.sh index 6cfe0fb9662..686e35adb8a 100644 --- a/apollo-adminservice/src/main/scripts/startup.sh +++ b/apollo-adminservice/src/main/scripts/startup.sh @@ -17,6 +17,11 @@ mkdir -p $LOG_DIR ########### The following is the same for configservice, adminservice, portal ########### export JAVA_OPTS="$JAVA_OPTS -XX:ParallelGCThreads=4 -XX:MaxTenuringThreshold=9 -XX:+DisableExplicitGC -XX:+ScavengeBeforeFullGC -XX:SoftRefLRUPolicyMSPerMB=0 -XX:+ExplicitGCInvokesConcurrent -XX:+HeapDumpOnOutOfMemoryError -XX:-OmitStackTraceInFastThrow -Duser.timezone=Asia/Shanghai -Dclient.encoding.override=UTF-8 -Dfile.encoding=UTF-8 -Djava.security.egd=file:/dev/./urandom" +# DataSource URL USERNAME PASSWORD +if [ "$DS_URL"x != x ] +then + export JAVA_OPTS="$JAVA_OPTS -Dspring.datasource.url=$DS_URL -Dspring.datasource.username=$DS_USERNAME -Dspring.datasource.password=$DS_PASSWORD" +fi export JAVA_OPTS="$JAVA_OPTS -Dserver.port=$SERVER_PORT -Dlogging.file=$LOG_DIR/$SERVICE_NAME.log -XX:HeapDumpPath=$LOG_DIR/HeapDumpOnOutOfMemoryError/" PATH_TO_JAR=$SERVICE_NAME".jar" diff --git a/apollo-configservice/src/main/docker/Dockerfile b/apollo-configservice/src/main/docker/Dockerfile index 79c41007766..030e3c71007 100755 --- a/apollo-configservice/src/main/docker/Dockerfile +++ b/apollo-configservice/src/main/docker/Dockerfile @@ -8,6 +8,10 @@ MAINTAINER ameizi ENV VERSION 1.5.0-SNAPSHOT ENV SERVER_PORT 8080 +# DataSource Info +ENV DS_URL "" +ENV DS_USERNAME "" +ENV DS_PASSWORD "" 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 \ diff --git a/apollo-configservice/src/main/scripts/startup.sh b/apollo-configservice/src/main/scripts/startup.sh index df77f7202fe..5fae4155720 100644 --- a/apollo-configservice/src/main/scripts/startup.sh +++ b/apollo-configservice/src/main/scripts/startup.sh @@ -17,6 +17,11 @@ mkdir -p $LOG_DIR ########### The following is the same for configservice, adminservice, portal ########### export JAVA_OPTS="$JAVA_OPTS -XX:ParallelGCThreads=4 -XX:MaxTenuringThreshold=9 -XX:+DisableExplicitGC -XX:+ScavengeBeforeFullGC -XX:SoftRefLRUPolicyMSPerMB=0 -XX:+ExplicitGCInvokesConcurrent -XX:+HeapDumpOnOutOfMemoryError -XX:-OmitStackTraceInFastThrow -Duser.timezone=Asia/Shanghai -Dclient.encoding.override=UTF-8 -Dfile.encoding=UTF-8 -Djava.security.egd=file:/dev/./urandom" +# DataSource URL USERNAME PASSWORD +if [ "$DS_URL"x != x ] +then + export JAVA_OPTS="$JAVA_OPTS -Dspring.datasource.url=$DS_URL -Dspring.datasource.username=$DS_USERNAME -Dspring.datasource.password=$DS_PASSWORD" +fi export JAVA_OPTS="$JAVA_OPTS -Dserver.port=$SERVER_PORT -Dlogging.file=$LOG_DIR/$SERVICE_NAME.log -XX:HeapDumpPath=$LOG_DIR/HeapDumpOnOutOfMemoryError/" PATH_TO_JAR=$SERVICE_NAME".jar" diff --git a/apollo-portal/src/main/docker/Dockerfile b/apollo-portal/src/main/docker/Dockerfile index cb84d72546f..4a3e0eb884c 100755 --- a/apollo-portal/src/main/docker/Dockerfile +++ b/apollo-portal/src/main/docker/Dockerfile @@ -8,6 +8,16 @@ MAINTAINER ameizi ENV VERSION 1.5.0-SNAPSHOT ENV SERVER_PORT 8070 +# DataSource Info +ENV DS_URL "" +ENV DS_USERNAME "" +ENV DS_PASSWORD "" +# Environmental variable declaration (meta server url, different environments should have different meta server addresses) +ENV DEV_META "" +ENV FAT_META "" +ENV UAT_META "" +ENV LPT_META "" +ENV PRO_META "" 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 \ diff --git a/apollo-portal/src/main/scripts/startup.sh b/apollo-portal/src/main/scripts/startup.sh index 0c9fd36b44c..517b640fc9d 100755 --- a/apollo-portal/src/main/scripts/startup.sh +++ b/apollo-portal/src/main/scripts/startup.sh @@ -17,6 +17,10 @@ mkdir -p $LOG_DIR ########### The following is the same for configservice, adminservice, portal ########### export JAVA_OPTS="$JAVA_OPTS -XX:ParallelGCThreads=4 -XX:MaxTenuringThreshold=9 -XX:+DisableExplicitGC -XX:+ScavengeBeforeFullGC -XX:SoftRefLRUPolicyMSPerMB=0 -XX:+ExplicitGCInvokesConcurrent -XX:+HeapDumpOnOutOfMemoryError -XX:-OmitStackTraceInFastThrow -Duser.timezone=Asia/Shanghai -Dclient.encoding.override=UTF-8 -Dfile.encoding=UTF-8 -Djava.security.egd=file:/dev/./urandom" +if [ "$DS_URL"x != x ] +then + export JAVA_OPTS="$JAVA_OPTS -Dspring.datasource.url=$DS_URL -Dspring.datasource.username=$DS_USERNAME -Dspring.datasource.password=$DS_PASSWORD" +fi export JAVA_OPTS="$JAVA_OPTS -Dserver.port=$SERVER_PORT -Dlogging.file=$LOG_DIR/$SERVICE_NAME.log -XX:HeapDumpPath=$LOG_DIR/HeapDumpOnOutOfMemoryError/" PATH_TO_JAR=$SERVICE_NAME".jar" From 5ebf81816cca086ee8716038f7bec3676a227d35 Mon Sep 17 00:00:00 2001 From: shanhongyu Date: Mon, 17 Jun 2019 15:47:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=AE=8C=E5=85=A8?= =?UTF-8?q?=E9=80=9A=E8=BF=87env=E9=85=8D=E7=BD=AE=E7=9A=84docker-compose.?= =?UTF-8?q?yml=E7=A4=BA=E4=BE=8B=EF=BC=9A=20------------------------------?= =?UTF-8?q?------------------------------------------------------------=20?= =?UTF-8?q?version:=20'3'=20services:=20=20=20apollo-portal:=20=20=20=20?= =?UTF-8?q?=20image:=20docker.io/xzxiaoshan/apollo-portal:1.4.0=20=20=20?= =?UTF-8?q?=20=20container=5Fname:=20apollo-portal=20=20=20=20=20network?= =?UTF-8?q?=5Fmode:=20"host"=20=20=20=20=20environment:=20=20=20=20=20=20?= =?UTF-8?q?=20SERVER=5FPORT:=205555=20=20=20=20=20=20=20#=20DataSource=20I?= =?UTF-8?q?nfo=20=20=20=20=20=20=20DS=5FURL:=20"jdbc:mysql://pro.shanhy.co?= =?UTF-8?q?m:3306/ApolloPortalDB=3FcharacterEncoding=3Dutf8"=20=20=20=20?= =?UTF-8?q?=20=20=20DS=5FUSERNAME:=20"shanhy"=20=20=20=20=20=20=20DS=5FPAS?= =?UTF-8?q?SWORD:=20"xzxiaoshan@123"=20=20=20=20=20=20=20#=20Environmental?= =?UTF-8?q?=20variable=20declaration=20(meta=20server=20url,=20different?= =?UTF-8?q?=20environments=20should=20have=20different=20meta=20server=20a?= =?UTF-8?q?ddresses)=20=20=20=20=20=20=20DEV=5FMETA:=20"http://dev.shanhy.?= =?UTF-8?q?com:6666"=20=20=20=20=20=20=20FAT=5FMETA:=20""=20=20=20=20=20?= =?UTF-8?q?=20=20UAT=5FMETA:=20""=20=20=20=20=20=20=20LPT=5FMETA:=20""=20?= =?UTF-8?q?=20=20=20=20=20=20PRO=5FMETA:=20"http://pro.shanhy.com:6666"=20?= =?UTF-8?q?=20=20=20=20depends=5Fon:=20=20=20=20=20=20=20-=20apollo-admins?= =?UTF-8?q?ervice=20=20=20=20=20logging:=20=20=20=20=20=20=20driver:=20"js?= =?UTF-8?q?on-file"=20=20=20=20=20=20=20options:=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20max-size:=20"200k"=20=20=20=20=20=20=20=20=20max-file:=20"10?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit apollo-configservice: image: docker.io/xzxiaoshan/apollo-configservice:1.4.0 container_name: apollo-configservice network_mode: "host" environment: SERVER_PORT: 6666 # DataSource Info DS_URL: "jdbc:mysql://pro.shanhy.com:3306/ApolloPortalDB?characterEncoding=utf8" DS_USERNAME: "shanhy" DS_PASSWORD: "xzxiaoshan@123" logging: driver: "json-file" options: max-size: "200k" max-file: "10" apollo-adminservice: image: docker.io/xzxiaoshan/apollo-adminservice:1.4.0 container_name: apollo-adminservice network_mode: "host" environment: SERVER_PORT: 6667 # DataSource Info DS_URL: "jdbc:mysql://pro.shanhy.com:3306/ApolloPortalDB?characterEncoding=utf8" DS_USERNAME: "shanhy" DS_PASSWORD: "xzxiaoshan@123" depends_on: - apollo-configservice logging: driver: "json-file" options: max-size: "200k" max-file: "10" --- apollo-portal/src/main/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apollo-portal/src/main/docker/Dockerfile b/apollo-portal/src/main/docker/Dockerfile index 4a3e0eb884c..4178f1ded73 100755 --- a/apollo-portal/src/main/docker/Dockerfile +++ b/apollo-portal/src/main/docker/Dockerfile @@ -8,7 +8,7 @@ MAINTAINER ameizi ENV VERSION 1.5.0-SNAPSHOT ENV SERVER_PORT 8070 -# DataSource Info +# DataSource Info ENV DS_URL "" ENV DS_USERNAME "" ENV DS_PASSWORD ""