root 4 年之前
父节点
当前提交
2b07bc4a26
共有 4 个文件被更改,包括 18 次插入15 次删除
  1. 4 4
      .drone.yml
  2. 12 9
      Dockerfile
  3. 二进制
      ads.war
  4. 2 2
      dellog.sh

+ 4 - 4
.drone.yml

@@ -1,7 +1,7 @@
 ---
 kind: pipeline
 type: kubernetes
-name: adserver
+name: ads
 
 clone:
   disable: true
@@ -23,7 +23,7 @@ steps:
      insecure: true
      mirror: https://ci7pm4nx.mirror.aliyuncs.com
      registry: hub.evbj.easou.com
-     repo: hub.evbj.easou.com/pro/${DRONE_REPO_NAME}
+     repo: hub.evbj.easou.com/oldad/${DRONE_REPO_NAME}
      tag: v1.0.0
 
  - name: deployment
@@ -31,7 +31,7 @@ steps:
    pull: always
    # privileged: true
    environment:
-     JNLP_ENV: pro
+     JNLP_ENV: oldad
      JNLP_REPLICAS: 2
      JNLP_TAG: v1.0.0
      JNLP_VERSION: v1  # default v1, v2 for canary
@@ -89,4 +89,4 @@ steps:
      btn_txt: "否"
    when:
      status:
-     - failure
+     - failure

+ 12 - 9
Dockerfile

@@ -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"]

二进制
ads.war


+ 2 - 2
dellog.sh

@@ -3,6 +3,6 @@
 set -e
 set -o pipefail
 rm -rf /data/project/*
-cp /app/resin-pro-3.1.6/webapps/ads.war /data/project/
+mv /app/resin-pro-3.1.6/webapps/ads.war /data/project/
 
-exec "$@"
+exec "$@"