root 3 anos atrás
pai
commit
9baa0f5a09
3 arquivos alterados com 4 adições e 4 exclusões
  1. 2 2
      .drone.yml
  2. 1 1
      Dockerfile
  3. 1 1
      entrypoint.sh

+ 2 - 2
.drone.yml

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

+ 1 - 1
Dockerfile

@@ -14,7 +14,7 @@ RUN rm -rf /app/wapage \
     && 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 ads.war /tmp/ads.war
 COPY supervisord.conf /etc/supervisord.conf
 COPY resin.conf /app/resin-pro-3.1.6/conf/resin.conf
 

+ 1 - 1
entrypoint.sh

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