diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e247a567..c33f7cf6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,7 @@ generate_git-log: - public/index.html - public/git-log.html only: - - dev + - 6suo tags: - galaxy @@ -42,7 +42,7 @@ build_project: - echo "npm run build" - cnpm run build only: - - dev + - 6suo - tags tags: - galaxy @@ -51,14 +51,14 @@ build_image: stage: build_image script: - echo "docker build" - - sudo docker build --no-cache -t cn-ui:$CNUI_TAG . + - sudo docker build --no-cache -t cn-ui-$CI_COMMIT_REF_NAME:$CNUI_TAG . - echo "docker tag" - - sudo docker tag cn-ui:$CNUI_TAG 192.168.40.153:9080/cyber-narrator/cn-ui:$CNUI_TAG + - sudo docker tag cn-ui-$CI_COMMIT_REF_NAME:$CNUI_TAG 192.168.40.153:9080/cyber-narrator/cn-ui-$CI_COMMIT_REF_NAME:$CNUI_TAG - echo "docker push" - - sudo docker push 192.168.40.153:9080/cyber-narrator/cn-ui:$CNUI_TAG + - sudo docker push 192.168.40.153:9080/cyber-narrator/cn-ui-$CI_COMMIT_REF_NAME:$CNUI_TAG when: on_success only: - - dev + - 6suo tags: - galaxy @@ -71,11 +71,11 @@ build_release_image: - echo '提交的版本是' - echo $CI_COMMIT_REF_NAME - echo "docker build" - - sudo docker build --no-cache -t cn-ui:$CI_COMMIT_TAG . + - sudo docker build --no-cache -t cn-ui-$CI_COMMIT_REF_NAME:$CI_COMMIT_TAG . - echo "docker tag" - - sudo docker tag cn-ui:$CI_COMMIT_TAG 192.168.40.153:9080/cyber-narrator/cn-ui:$CI_COMMIT_TAG + - sudo docker tag cn-ui-$CI_COMMIT_REF_NAME:$CI_COMMIT_TAG 192.168.40.153:9080/cyber-narrator/cn-ui-$CI_COMMIT_REF_NAME:$CI_COMMIT_TAG - echo "docker push" - - sudo docker push 192.168.40.153:9080/cyber-narrator/cn-ui:$CI_COMMIT_TAG + - sudo docker push 192.168.40.153:9080/cyber-narrator/cn-ui-$CI_COMMIT_REF_NAME:$CI_COMMIT_TAG only: - tags tags: