fjy8018/cms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Dockerfile修复

Browse Source
This commit is contained in:
F嘉阳
2019-11-27 11:52:05 +08:00
parent 27b6034046
commit d4a894840f
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
.gitlab-ci.yml
View File

@@ -14,7 +14,7 @@ stages:
- test - test
- package - package
- review - review
- deploy # - deploy
maven-build: maven-build:
image: harbor.fjy8018.top:8883/library/maven:3-jdk-8 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 - 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 - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$IMAGE_VERSION
deploy_live: #deploy_live:
image: harbor.fjy8018.top:8883/offical/kubectl:v1.14.0 # image: harbor.fjy8018.top:8883/offical/kubectl:v1.14.0
stage: deploy # stage: deploy
retry: 2 # retry: 2
environment: # environment:
name: prod # name: prod
url: https://cms.fjy8018.xin # url: https://cms.fjy8018.xin
script: # script:
- kubectl version # - kubectl version
- kubectl get pods -n hmdt # - kubectl get pods -n hmdt
- cd manifests/ # - cd manifests/
- sed -i "s/__IMAGE_VERSION_SLUG__/${IMAGE_VERSION}/" deployment.yaml # - sed -i "s/__IMAGE_VERSION_SLUG__/${IMAGE_VERSION}/" deployment.yaml
- sed -i "s/__IMAGE_SLUG__/${CI_REGISTRY_IMAGE}/" deployment.yaml # - sed -i "s/__IMAGE_SLUG__/${CI_REGISTRY_IMAGE}/" deployment.yaml
- kubectl apply -f deployment.yaml # - kubectl apply -f deployment.yaml
# - kubectl rollout status -f deployment.yaml # # - kubectl rollout status -f deployment.yaml
- kubectl get pods -n hmdt # - kubectl get pods -n hmdt

2
Dockerfile
View File

@@ -1,7 +1,7 @@
FROM harbor.fjy8018.top:8883/library/openjdk:8-jre FROM harbor.fjy8018.top:8883/library/openjdk:8-jre
MAINTAINER fjy8018 fjy8018@gmail.com 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 # 设置时区，默认为UTC
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
RUN echo 'Asia/Shanghai' > /etc/timezone RUN echo 'Asia/Shanghai' > /etc/timezone