浏览代码

更新 'Dockerfile'

stone 4 年之前
父节点
当前提交
a0d0bda8f9
共有 1 个文件被更改,包括 25 次插入15 次删除
  1. 25 15
      Dockerfile

+ 25 - 15
Dockerfile

@@ -1,23 +1,33 @@
-FROM hub.evbj.easou.com/dev/centos68-resin:3.1.16-jdk7
+FROM hub.evbj.easou.com/dev/centos:6.8
 MAINTAINER scofield[scofield_shi@easou.cn]
 MAINTAINER scofield[scofield_shi@easou.cn]
 
 
-COPY release /etc/release
-COPY entrypoint.sh /usr/bin/entrypoint.sh
-COPY rsyncd.wapage /etc/rsyncd.wapage
-COPY release /etc/release
 
 
-RUN yum install -y rsync \
-	&& && useradd book \
-	&& yum install -y wget rsync epel-release \
-	&& yum install -y vixie-cron \
-	&& yum install -y supervisor \
-	&& curl -O http://10.26.22.185:9000/psop/soft/misc.tar.gz \
-	&& mkdir /app/wapage -p \
-	&& tar zxf misc.tar.gz -C /app/wapage \
-	&& chmod +x /usr/bin/entrypoint.sh 
+ENV LANG C.UTF-8
+ENV TZ=Asia/Shanghai
+ENV JAVA_HOME /usr/java/jdk1.6.0_21
+
+#install 
+RUN yum install -y wget rsync epel-release \
+    && useradd wapage \
+    && yum install -y supervisor \
+    && mkdir -p /usr/java  /app/wapage \
+    && curl -O http://10.26.22.185:9000/psop/soft/jdk1.6.0_21.tar.gz \
+    && curl -O http://10.26.22.185:9000/psop/soft/misc.tar.gz \
+    && tar -zxf jdk1.6.0_21.tar.gz -C /usr/java/ \ 
+    && tar -zxf misc.tar.gz -C /app/waphost/ \
+    && rm -f misc.tar.gz jdk1.6.0_21.tar.gz \
+	&& rm -f /app/wapage/miscSearch/start.sh
+    && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone 
 
 
+COPY entrypoint.sh /usr/bin/entrypoint.sh
+COPY release /etc/release 
 COPY supervisord.conf /etc/supervisord.conf
 COPY supervisord.conf /etc/supervisord.conf
+COPY start.sh /app/wapage/miscSearch/start.sh 
+
+RUN export RELEASE=`head -n 1 /etc/release` \
+    && rsync -avz $RELEASE/ROOT.war /tmp/ROOT.war \
+    && chmod +x /usr/bin/entrypoint.sh /app/wapage/miscSearch/start.sh
 
 
 #start misc
 #start misc
 ENTRYPOINT ["entrypoint.sh"]
 ENTRYPOINT ["entrypoint.sh"]
-CMD ["/usr/bin/supervisord"]
+CMD ["supervisord"]