Commit 46ed5271 authored by xzxiaoshan's avatar xzxiaoshan Committed by Jason Song

support setting server port from enviroment variables

1.将服务端口提取到docker run的 -e SERVER_PORT 可指定,在docker需要使用host网络时,可以不用修改代码指定端口,避免与宿主机上的原有端口占用冲突 (#2333)

2.对docker CMD入口的startup.sh文件,增加可执行授权指令,防止在某些时候该文件被打包进入后没有执行权限的麻烦(已实际遇到,又回头重新打包)
parent e7b1fecc
...@@ -7,6 +7,7 @@ FROM openjdk:8-jre-alpine ...@@ -7,6 +7,7 @@ FROM openjdk:8-jre-alpine
MAINTAINER ameizi <sxyx2008@163.com> MAINTAINER ameizi <sxyx2008@163.com>
ENV VERSION 1.5.0-SNAPSHOT ENV VERSION 1.5.0-SNAPSHOT
ENV SERVER_PORT 8090
RUN echo "http://mirrors.aliyun.com/alpine/v3.8/main" > /etc/apk/repositories \ 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 \ && 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 ...@@ -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 \ RUN unzip /apollo-adminservice/apollo-adminservice-${VERSION}-github.zip -d /apollo-adminservice \
&& rm -rf /apollo-adminservice/apollo-adminservice-${VERSION}-github.zip \ && rm -rf /apollo-adminservice/apollo-adminservice-${VERSION}-github.zip \
&& sed -i '$d' /apollo-adminservice/scripts/startup.sh \ && 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 && echo "tail -f /dev/null" >> /apollo-adminservice/scripts/startup.sh
EXPOSE 8090 EXPOSE $SERVER_PORT
CMD ["/apollo-adminservice/scripts/startup.sh"] CMD ["/apollo-adminservice/scripts/startup.sh"]
...@@ -3,7 +3,8 @@ SERVICE_NAME=apollo-adminservice ...@@ -3,7 +3,8 @@ SERVICE_NAME=apollo-adminservice
## Adjust log dir if necessary ## Adjust log dir if necessary
LOG_DIR=/opt/logs/100003172 LOG_DIR=/opt/logs/100003172
## Adjust server port if necessary ## 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 ## Create log directory if not existed because JDK 8+ won't do that
mkdir -p $LOG_DIR mkdir -p $LOG_DIR
......
...@@ -7,6 +7,7 @@ FROM openjdk:8-jre-alpine ...@@ -7,6 +7,7 @@ FROM openjdk:8-jre-alpine
MAINTAINER ameizi <sxyx2008@163.com> MAINTAINER ameizi <sxyx2008@163.com>
ENV VERSION 1.5.0-SNAPSHOT ENV VERSION 1.5.0-SNAPSHOT
ENV SERVER_PORT 8080
RUN echo "http://mirrors.aliyun.com/alpine/v3.8/main" > /etc/apk/repositories \ 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 \ && 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 ...@@ -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 \ RUN unzip /apollo-configservice/apollo-configservice-${VERSION}-github.zip -d /apollo-configservice \
&& rm -rf /apollo-configservice/apollo-configservice-${VERSION}-github.zip \ && rm -rf /apollo-configservice/apollo-configservice-${VERSION}-github.zip \
&& sed -i '$d' /apollo-configservice/scripts/startup.sh \ && 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 && echo "tail -f /dev/null" >> /apollo-configservice/scripts/startup.sh
EXPOSE 8080 EXPOSE $SERVER_PORT
CMD ["/apollo-configservice/scripts/startup.sh"] CMD ["/apollo-configservice/scripts/startup.sh"]
...@@ -3,7 +3,8 @@ SERVICE_NAME=apollo-configservice ...@@ -3,7 +3,8 @@ SERVICE_NAME=apollo-configservice
## Adjust log dir if necessary ## Adjust log dir if necessary
LOG_DIR=/opt/logs/100003171 LOG_DIR=/opt/logs/100003171
## Adjust server port if necessary ## 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 ## Create log directory if not existed because JDK 8+ won't do that
mkdir -p $LOG_DIR mkdir -p $LOG_DIR
......
...@@ -7,6 +7,7 @@ FROM openjdk:8-jre-alpine ...@@ -7,6 +7,7 @@ FROM openjdk:8-jre-alpine
MAINTAINER ameizi <sxyx2008@163.com> MAINTAINER ameizi <sxyx2008@163.com>
ENV VERSION 1.5.0-SNAPSHOT ENV VERSION 1.5.0-SNAPSHOT
ENV SERVER_PORT 8070
RUN echo "http://mirrors.aliyun.com/alpine/v3.8/main" > /etc/apk/repositories \ 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 \ && 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}- ...@@ -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 \ RUN unzip /apollo-portal/apollo-portal-${VERSION}-github.zip -d /apollo-portal \
&& rm -rf /apollo-portal/apollo-portal-${VERSION}-github.zip \ && rm -rf /apollo-portal/apollo-portal-${VERSION}-github.zip \
&& sed -i '$d' /apollo-portal/scripts/startup.sh \ && 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 && echo "tail -f /dev/null" >> /apollo-portal/scripts/startup.sh
EXPOSE 8070 EXPOSE $SERVER_PORT
CMD ["/apollo-portal/scripts/startup.sh"] CMD ["/apollo-portal/scripts/startup.sh"]
...@@ -3,7 +3,8 @@ SERVICE_NAME=apollo-portal ...@@ -3,7 +3,8 @@ SERVICE_NAME=apollo-portal
## Adjust log dir if necessary ## Adjust log dir if necessary
LOG_DIR=/opt/logs/100003173 LOG_DIR=/opt/logs/100003173
## Adjust server port if necessary ## 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 ## Create log directory if not existed because JDK 8+ won't do that
mkdir -p $LOG_DIR mkdir -p $LOG_DIR
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment