diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index be5c05c..19819f1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ stages: - test - package - review - - deploy +# - deploy maven-build: image: harbor.fjy8018.top:8883/library/maven:3-jdk-8 @@ -52,19 +52,19 @@ 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 rollout status -f deployment.yaml +# - kubectl get pods -n hmdt diff --git a/Dockerfile b/Dockerfile index ad4a612..b4fea6a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM harbor.fjy8018.top:8883/library/openjdk:8-jre MAINTAINER fjy8018 fjy8018@gmail.com -COPY target/spring-V2.9.13.jar.jar /cms-springboot.jar +COPY target/spring-V2.9.13.jar /cms-springboot.jar # 设置时区,默认为UTC RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime RUN echo 'Asia/Shanghai' > /etc/timezone