Quellcode durchsuchen

更新 'Dockerfile-base'

scofield vor 5 Jahren
Ursprung
Commit
0ce219d324
1 geänderte Dateien mit 26 neuen und 14 gelöschten Zeilen
  1. 26 14
      Dockerfile-base

+ 26 - 14
Dockerfile-base

@@ -1,20 +1,32 @@
-#centos68-resin:4.0.58-jdk8
-FROM hub.evbj.easou.com/dev/centos68-resin:4.0.58-jdk8
+FROM FROM hub.evbj.easou.com/dev/centos:7.6
 LABEL author="robert[robert_du@easou.cn]"
 
-RUN mkdir -p /data/project /app/soft
-ADD resin.xml /etc/resin/resin.xml
-ADD cluster-default.xml /etc/resin/cluster-default.xml
-ADD resin.properties /etc/resin/resin.properties
-ADD entrypoint.sh /usr/bin/entrypoint.sh
-ADD http://10.26.22.185:9000/psop/soft/flume-1.7.0.tar.gz /app/soft 
-ADD release /etc/release
+ENV LANG C.UTF-8
+ENV TZ=Asia/Shanghai
+ENV JAVA_HOME /usr/java/jdk1.8.0_101
 
-RUN yum install rsync -y \
-    && export RELEASE=`head -n 1 /etc/release` \
-    && rsync -avz $RELEASE/ROOT.war /app/wapage/webfront \
-    && cd /app/soft/ && tar xf flume-1.7.0.tar.gz && useradd book \
-    && rm -f /app/soft/flume-1.7.0.tar.gz \
+#install jdk8 & resin4
+RUN yum install -y wget rsync epel-release supervisor \
+    && useradd book \
+    && mkdir -p /usr/java  /app/soft \
+    && curl -O http://10.26.22.185:9000/psop/soft/jdk-8u101-linux-x64.tar.gz \
+    && curl -O http://10.26.22.185:9000/psop/soft/flume-1.7.0.tar.gz \
+    && tar -zxf jdk-8u101-linux-x64.tar.gz -C /usr/java/ \ 
+    && tar -zxf flume-1.7.0.tar.gz -C /app/soft/ \
+    && rm -f jdk-8u101-linux-x64.tar.gz flume-1.7.0.tar.gz \
+    && yum install -y http://10.26.22.185/source/rpm/resin-pro-4.0.58-1.x86_64.rpm \
+    && rm -f /etc/resin/cluster-default.xml  /etc/resin/resin.xml  /etc/resin/resin.properties \
+    && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone 
+
+COPY resin.xml /etc/resin/resin.xml
+COPY cluster-default.xml /etc/resin/cluster-default.xml
+COPY resin.properties /etc/resin/resin.properties
+COPY entrypoint.sh /usr/bin/entrypoint.sh
+COPY release /etc/release 
+COPY supervisord.conf /etc/supervisord.conf
+
+RUN export RELEASE=`head -n 1 /etc/release` \
+    && rsync -avz $RELEASE/ROOT.war /tmp/ROOT.war \
     && chmod +x /usr/bin/entrypoint.sh
 
 #start resin