root 2 роки тому
батько
коміт
2e53c3383c
4 змінених файлів з 16 додано та 16 видалено
  1. 3 13
      .drone.yml
  2. 3 2
      Dockerfile
  3. 8 1
      deploy-tmp.yaml
  4. 2 0
      entrypoint.sh

+ 3 - 13
.drone.yml

@@ -14,16 +14,6 @@ steps:
    commands:
    - git clone --depth=1 $DRONE_GIT_HTTP_URL .
 
- - name: build
-   image: plugins/docker
-   settings:
-     username: admin
-     password: Easou2)1*
-     insecure: true
-     mirror: https://ci7pm4nx.mirror.aliyuncs.com
-     registry: hub.evbj.easou.com
-     repo: hub.evbj.easou.com/pro/${DRONE_REPO_NAME}
-     tag: v3.0.0-apm
  - name: build
    image: plugins/docker
    settings:
@@ -33,7 +23,7 @@ steps:
      mirror: https://ci7pm4nx.mirror.aliyuncs.com
      registry: hub.evbj.easou.com
      repo: hub.evbj.easou.com/dev/${DRONE_REPO_NAME}
-     tag: v1.0.7
+     tag: v3.0.0
      
  - name: deployment
    image: hub.evbj.easou.com/dev/drone-agent:v3.0.0
@@ -42,7 +32,7 @@ steps:
    environment:
      JNLP_ENV: dev
      JNLP_REPLICAS: 2
-     JNLP_TAG: v1.0.7
+     JNLP_TAG: 3.0.0
      JNLP_VERSION: v1  # default v1, v2 for canary
      DEPLOY_ENV: k8s-1 # 可以选择把应用部署到集群:k8s-1(阿里云) or k8s-2(IDC机房)
      JNLP_REPO: hub.evbj.easou.com
@@ -97,4 +87,4 @@ steps:
      btn_txt: "否"
    when:
      status:
-     - failure
+     - failure

+ 3 - 2
Dockerfile

@@ -1,8 +1,9 @@
-FROM hub.evbj.easou.com/dev/book-api:v3base
+FROM hub.evbj.easou.com/dev/book-api:v3.1base
 
 
-COPY resin.properties /app/soft/resin-4.0.65/conf/resin.properties
+#COPY resin.properties /app/soft/resin-4.0.65/conf/resin.properties
 COPY entrypoint.sh /usr/bin/entrypoint.sh
+ADD http://10.26.22.190/release/app-web/prod-64/novelapi/3.1.278/novelapi_3.1.278_kuaiDu3.15.4Dev_B3.1.277-179663_3.1.278_20220825-112355_RBL/ROOT.war /tmp/ROOT.war
 
 
 

+ 8 - 1
deploy-tmp.yaml

@@ -1,5 +1,6 @@
 ---
-apiVersion: apps/v1
+apiVersion: apps.kruise.io/v1beta1
+#apiVersion: apps/v1
 kind: $JNLP_CONTROL
 metadata:
   name: $DRONE_REPO_NAME
@@ -46,6 +47,12 @@ spec:
             port: $JNLP_CONTAINER_PORT
           initialDelaySeconds: $JNLP_READINESS_INIT
           periodSeconds: $JNLP_READINESS_PER
+  updateStrategy:
+    type: RollingUpdate
+    rollingUpdate:
+      podUpdatePolicy: InPlaceIfPossible
+      inPlaceUpdateStrategy:
+        gracePeriodSeconds: 10
   volumeClaimTemplates:
   - metadata:
       name: volume

+ 2 - 0
entrypoint.sh

@@ -5,6 +5,8 @@ set -o pipefail
 
 rm -f /app/soft/resin-4.0.65/log/jvm-app-0.log
 mkdir -p /data/project /data/log  /log
+rm -rf /data/project/*
+mv /tmp/ROOT.war /data/project/
 
 
 exec "$@"