|
@@ -2,20 +2,23 @@ FROM hub.evbj.easou.com/pro/wapage2web:v1.0.5
|
|
|
MAINTAINER scofield[scofield_shi@easou.cn]
|
|
|
|
|
|
ENV TZ=Asia/Shanghai
|
|
|
+
|
|
|
COPY entrypoint.sh /usr/bin/entrypoint.sh
|
|
|
COPY dellog.sh /app/dellog.sh
|
|
|
+
|
|
|
RUN rm -rf /app/wapage \
|
|
|
- && rm -f /etc/supervisord.conf \
|
|
|
- && rm -rf /usr/local/java/* \
|
|
|
- && chmod +x /usr/bin/entrypoint.sh \
|
|
|
- && chmod +x /app/dellog.sh \
|
|
|
- && curl -O http://10.26.22.185:9000/psop/soft/jdk1.8.0_191.tar.gz \
|
|
|
- && tar -zxf jdk1.8.0_191.tar.gz -C /usr/local/java/ \
|
|
|
- && mv /usr/local/java/jdk1.8.0_191 /usr/local/java/jdk1.6.0_21
|
|
|
-ADD http://10.26.22.185:9000/psop/soft/ads.war /app/resin-pro-3.1.6/webapps/ads.war
|
|
|
+ && rm -f /etc/supervisord.conf \
|
|
|
+ && rm -rf /usr/local/java/* \
|
|
|
+ && curl -O http://10.26.22.185:9000/psop/soft/jdk1.8.0_191.tar.gz \
|
|
|
+ && tar -zxf jdk1.8.0_191.tar.gz -C /usr/local/java/ \
|
|
|
+ && mv /usr/local/java/jdk1.8.0_191 /usr/local/java/jdk1.6.0_21
|
|
|
+
|
|
|
+#ADD http://10.26.22.185:9000/psop/soft/ads.war /app/resin-pro-3.1.6/webapps/ads.war
|
|
|
+COPY ads.war /app/resin-pro-3.1.6/webapps/ads.war
|
|
|
COPY supervisord.conf /etc/supervisord.conf
|
|
|
COPY resin.conf /app/resin-pro-3.1.6/conf/resin.conf
|
|
|
|
|
|
|
|
|
#start resin
|
|
|
-CMD ["supervisord"]
|
|
|
+ENTRYPOINT ["entrypoint.sh"]
|
|
|
+CMD ["supervisord"]
|