From 15cc4e5afcd618e489fbf5333585513ac1303538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=E5=98=89=E9=98=B3?= <fjy8018@qq.com>
Date: Wed, 27 Nov 2019 14:05:23 +0800
Subject: [PATCH] =?UTF-8?q?ci=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 80f1b6e..0f4b99c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,19 +52,18 @@ docker-harbor-build:
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
     - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$IMAGE_VERSION
 
-#deploy_live:
-#  image: harbor.fjy8018.top:8883/offical/kubectl:v1.14.0
-#  stage: deploy
-#  retry: 2
-#  environment:
-#    name: prod
-#    url: https://cms.fjy8018.xin
-#  script:
-#    - kubectl version
-#    - kubectl get pods -n hmdt
-#    - cd manifests/
-#    - sed -i "s/__IMAGE_VERSION_SLUG__/${IMAGE_VERSION}/" deployment.yaml
-#    - sed -i "s/__IMAGE_SLUG__/${CI_REGISTRY_IMAGE}/" deployment.yaml
-#    - kubectl apply -f deployment.yaml
-#    #    - kubectl rollout status -f deployment.yaml
-#    - kubectl get pods -n hmdt
+deploy_live:
+  image: harbor.fjy8018.top:8883/offical/kubectl:v1.14.0
+  stage: deploy
+  retry: 2
+  environment:
+    name: prod
+    url: https://cms.fjy8018.xin
+  script:
+    - kubectl version
+    - kubectl get pods -n hmdt
+    - cd manifests/
+    - sed -i "s/__IMAGE_VERSION_SLUG__/${IMAGE_VERSION}/" deployment.yaml
+    - sed -i "s/__IMAGE_SLUG__/${CI_REGISTRY_IMAGE}/" deployment.yaml
+    - kubectl apply -f deployment.yaml
+    - kubectl get pods -n hmdt