yangxg 2 سال پیش
والد
کامیت
e072db71b0
4فایلهای تغییر یافته به همراه35 افزوده شده و 23 حذف شده
  1. 2 2
      .drone.yml
  2. 2 20
      Dockerfile
  3. 31 0
      Dockerfile-base
  4. 0 1
      entrypoint.sh

+ 2 - 2
.drone.yml

@@ -23,7 +23,7 @@ steps:
       mirror: https://ci7pm4nx.mirror.aliyuncs.com
       registry: hub.evbj.easou.com
       repo: hub.evbj.easou.com/pro/${DRONE_REPO_NAME}
-      tag: r13
+      tag: r14
      
   - name: deployment
     image: hub.evbj.easou.com/dev/drone-agent:v3.0.1
@@ -32,7 +32,7 @@ steps:
     environment:
       JNLP_ENV: pro
       JNLP_REPLICAS: 1
-      JNLP_TAG: r13
+      JNLP_TAG: r14
       JNLP_VERSION: v1  # default v1, v2 for canary
       DEPLOY_ENV: k8s-1 # 可以选择把应用部署到集群:k8s-1 or k8s-2
       JNLP_REPO: hub.evbj.easou.com

+ 2 - 20
Dockerfile

@@ -1,25 +1,7 @@
-FROM hub.evbj.easou.com/dev/centos:7.9.2009
-
-LABEL author="robert[robert_du@easou.cn]"
-
-ENV LANG en_US.UTF-8
-ENV TZ=Asia/Shanghai
-ENV JAVA_HOME /usr/java/jdk1.8.0_271
+FROM hub.evbj.easou.com/pro/nginx-material:r13
 
 COPY entrypoint.sh /usr/bin/entrypoint.sh
-
-#install jdk8 & resin4
-
-RUN yum install -y epel-release \
-    && yum -y install wget rsync lsof crontabs vim psmisc\
-    && yum install -y supervisor \
-    && yum install -y nginx \
-    && mkdir -p /usr/java  /app/soft /cron/root \
-    && curl -O http://10.26.22.113:9000/psop/soft/jdk1.8.0_271.tar.gz \
-    && tar -xf jdk1.8.0_271.tar.gz -C /usr/java/ \
-    && rm -f jdk1.8.0_271.tar.gz \
-    && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \
-    && chmod +x /usr/bin/entrypoint.sh
+RUN chmod +x /usr/bin/entrypoint.sh
 COPY root /var/spool/cron/root
 COPY rsync.sh /cron/root/rsync.sh
 ADD nginx.conf /etc/nginx/nginx.conf

+ 31 - 0
Dockerfile-base

@@ -0,0 +1,31 @@
+FROM hub.evbj.easou.com/dev/centos:7.9.2009
+
+LABEL author="robert[robert_du@easou.cn]"
+
+ENV LANG en_US.UTF-8
+ENV TZ=Asia/Shanghai
+ENV JAVA_HOME /usr/java/jdk1.8.0_271
+
+COPY entrypoint.sh /usr/bin/entrypoint.sh
+
+#install jdk8 & resin4
+
+RUN yum install -y epel-release \
+    && yum -y install wget rsync lsof crontabs vim psmisc\
+    && yum install -y supervisor \
+    && yum install -y nginx \
+    && mkdir -p /usr/java  /app/soft /cron/root \
+    && curl -O http://10.26.22.113:9000/psop/soft/jdk1.8.0_271.tar.gz \
+    && tar -xf jdk1.8.0_271.tar.gz -C /usr/java/ \
+    && rm -f jdk1.8.0_271.tar.gz \
+    && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \
+    && chmod +x /usr/bin/entrypoint.sh
+COPY root /var/spool/cron/root
+COPY rsync.sh /cron/root/rsync.sh
+ADD nginx.conf /etc/nginx/nginx.conf
+COPY nginx.ini /etc/supervisord.d/nginx.ini
+COPY rsync.qd /etc/rsync.qd
+
+#start resin
+ENTRYPOINT ["entrypoint.sh"]
+CMD ["supervisord"]

+ 0 - 1
entrypoint.sh

@@ -6,7 +6,6 @@ set -o pipefail
 chmod 600 /var/spool/cron/root
 chmod 600 /etc/rsync.qd
 sed -i -e '/pam_loginuid.so/s/^/#/' /etc/pam.d/crond
-rm -rf /app/soft/resin-4.0.65/log/jvm-app-0.log
 mkdir -p /data/logs/cron
 echo 'export JAVA_HOME=/usr/java/jdk1.8.0_271' >> /etc/profile
 echo 'export CLASSPATH=$CLASSPATH:$JAVA_HOME/lib:$JAVA_HOME/jre/lib' >> /etc/profile