瀏覽代碼

[CI SKIP]

root 4 年之前
父節點
當前提交
b2f0019c2a
共有 2 個文件被更改,包括 51 次插入50 次删除
  1. 1 50
      Dockerfile
  2. 50 0
      Dockerfile-v3base

+ 1 - 50
Dockerfile

@@ -1,50 +1 @@
-FROM centos:7
-
-LABEL author="scofield[scofield_shi@staff.easou.com]"
-
-ENV LANG C.UTF-8
-ENV TZ=Asia/Shanghai
-ENV JAVA_HOME /usr/java/jdk1.8.0_101
-ENV RESIN_HOME /app/soft/resin-4.0.65
-
-COPY ./entrypoint.sh /usr/bin/entrypoint.sh
-ADD http://10.26.22.185:9000/book/api-rs/resin-4.0.65-relase.tar.gz /app/soft/resin-4.0.65-relase.tar.gz
-ADD http://10.26.22.185:9000/psop/soft/flume-1.7.0.tar.gz /app/soft/flume-1.7.0.tar.gz
-ADD http://10.26.22.185:9000/psop/soft/tengine.tar.gz /app/soft/tengine.tar.gz 
-ADD http://10.26.22.185:9000/psop/soft/jdk-8u101-linux-x64.tar.gz /usr/java/jdk-8u101-linux-x64.tar.gz
-ADD http://mirrors.163.com/.help/CentOS7-Base-163.repo /opt/Centos-7.repo
-ADD http://mirrors.aliyun.com/repo/epel-7.repo /opt/epel-7.repo
-
-RUN rm -rf /etc/yum.repos.d/* \
-    && mv /opt/*.repo /etc/yum.repos.d/ \
-    && yum clean all \
-    && yum install supervisor -y \
-    && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \
-    && tar -xf /app/soft/resin-4.0.65-relase.tar.gz -C /app/soft \
-    && tar -xf /app/soft/flume-1.7.0.tar.gz -C /app/soft  \
-    && tar -xf /app/soft/tengine.tar.gz -C /app/soft \
-    && mkdir -p /app/soft/tengine/conf/vhosts/www \
-    && useradd wapage && useradd nginx \
-    && tar -xf /usr/java/jdk-8u101-linux-x64.tar.gz -C /usr/java \
-    && rm -f /app/soft/resin-4.0.65-relase.tar.gz \
-    && rm -f /app/soft/flume-1.7.0.tar.gz \
-    && rm -f /app/soft/tengine.tar.gz \
-    && rm -f /usr/java/jdk-8u101-linux-x64.tar.gz \
-    && rm -rf /app/soft/resin-4.0.65/webapps/* \
-    && chown wapage.wapage -R /app/soft/resin-4.0.65/ \
-    && chmod +x /usr/bin/entrypoint.sh
-
-COPY nginxlog_cut.sh /cron/root/nginxlog_cut.sh
-COPY nginx.conf /app/soft/tengine/conf
-COPY hostlist.conf /app/soft/tengine/conf/vhosts/www/hostlist.conf
-COPY www.conf /app/soft/tengine/conf/vhosts/www/www.conf
-COPY root /var/spool/cron/root
-COPY rsyncd.wapage /etc/rsyncd.wapage
-COPY release /etc/release
-COPY flume.conf /app/soft/flume-1.7.0/conf/flume.conf
-COPY resin.ini /etc/supervisor/conf.d/resin.ini
-
-
-ENTRYPOINT ["entrypoint.sh"]
-CMD ["/usr/bin/supervisord","-c", "/etc/supervisor/supervisord.conf"]
-
+FROM hub.evbj.easou.com/dev/dashouye:v3base

+ 50 - 0
Dockerfile-v3base

@@ -0,0 +1,50 @@
+FROM centos:7
+
+LABEL author="scofield[scofield_shi@staff.easou.com]"
+
+ENV LANG C.UTF-8
+ENV TZ=Asia/Shanghai
+ENV JAVA_HOME /usr/java/jdk1.8.0_101
+ENV RESIN_HOME /app/soft/resin-4.0.65
+
+COPY ./entrypoint.sh /usr/bin/entrypoint.sh
+ADD http://10.26.22.185:9000/book/api-rs/resin-4.0.65-relase.tar.gz /app/soft/resin-4.0.65-relase.tar.gz
+ADD http://10.26.22.185:9000/psop/soft/flume-1.7.0.tar.gz /app/soft/flume-1.7.0.tar.gz
+ADD http://10.26.22.185:9000/psop/soft/tengine.tar.gz /app/soft/tengine.tar.gz 
+ADD http://10.26.22.185:9000/psop/soft/jdk-8u101-linux-x64.tar.gz /usr/java/jdk-8u101-linux-x64.tar.gz
+ADD http://mirrors.163.com/.help/CentOS7-Base-163.repo /opt/Centos-7.repo
+ADD http://mirrors.aliyun.com/repo/epel-7.repo /opt/epel-7.repo
+
+RUN rm -rf /etc/yum.repos.d/* \
+    && mv /opt/*.repo /etc/yum.repos.d/ \
+    && yum clean all \
+    && yum install supervisor -y \
+    && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \
+    && tar -xf /app/soft/resin-4.0.65-relase.tar.gz -C /app/soft \
+    && tar -xf /app/soft/flume-1.7.0.tar.gz -C /app/soft  \
+    && tar -xf /app/soft/tengine.tar.gz -C /app/soft \
+    && mkdir -p /app/soft/tengine/conf/vhosts/www \
+    && useradd wapage && useradd nginx \
+    && tar -xf /usr/java/jdk-8u101-linux-x64.tar.gz -C /usr/java \
+    && rm -f /app/soft/resin-4.0.65-relase.tar.gz \
+    && rm -f /app/soft/flume-1.7.0.tar.gz \
+    && rm -f /app/soft/tengine.tar.gz \
+    && rm -f /usr/java/jdk-8u101-linux-x64.tar.gz \
+    && rm -rf /app/soft/resin-4.0.65/webapps/* \
+    && chown wapage.wapage -R /app/soft/resin-4.0.65/ \
+    && chmod +x /usr/bin/entrypoint.sh
+
+COPY nginxlog_cut.sh /cron/root/nginxlog_cut.sh
+COPY nginx.conf /app/soft/tengine/conf
+COPY hostlist.conf /app/soft/tengine/conf/vhosts/www/hostlist.conf
+COPY www.conf /app/soft/tengine/conf/vhosts/www/www.conf
+COPY root /var/spool/cron/root
+COPY rsyncd.wapage /etc/rsyncd.wapage
+COPY release /etc/release
+COPY flume.conf /app/soft/flume-1.7.0/conf/flume.conf
+COPY resin.ini /etc/supervisor/conf.d/resin.ini
+
+
+ENTRYPOINT ["entrypoint.sh"]
+CMD ["/usr/bin/supervisord","-c", "/etc/supervisor/supervisord.conf"]
+