summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlijinyang <[email protected]>2023-02-15 17:38:06 +0800
committerlijinyang <[email protected]>2023-02-15 17:38:06 +0800
commit9356f8f211ebadb9a23da272194b1f78b7385caf (patch)
treee874fb27da05fdcd5ee1e6fb36f60ca2ab26b611
parent07afe172006bb4f25b5157155bf94e35980e84e2 (diff)
Update .gitlab-ci.yml6suo
-rw-r--r--.gitlab-ci.yml5
1 files changed, 2 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fe1feb8..05b16e0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,7 @@ build_image:
- echo 'XJAR_PIN :' $XJAR_PIN
- echo 'CNWEB_TAG:' $CNWEB_TAG
- echo 'exec build_image'
- - cd cn-admin && mvn package -Dxjar.password=$XJAR_PIN docker:build -DpushImageTag -DdockerImageTags=$CNWEB_TAG -DdockerImageName=192.168.40.153:9080/cyber-narrator/cn-web-$CI_COMMIT_REF_NAME
+ - cd cn-admin && mvn package -Dxjar.password=$XJAR_PIN docker:build -DpushImage -DdockerImageTags=$CNWEB_TAG -DdockerImageName=192.168.40.153:9080/cyber-narrator/cn-web-$CI_COMMIT_REF_NAME:$CNWEB_TAG
#when用于当前一阶段任务故障或者忽略故障的job任务,主要用于清理发生故障时的后续措施。
#可选项
#on_success - 默认参数,前一阶段任务成功时才执行
@@ -59,8 +59,7 @@ build_release_image:
- echo '提交的版本是'
- echo $CI_COMMIT_REF_NAME
- echo 'exec build_image'
- - cd cn-admin && mvn package -Dxjar.password=$XJAR_PIN docker:build -DpushImageTag -DdockerImageTags=$CNWEB_TAG -DdockerImageName=192.168.40.153:9080/cyber-narrator/cn-web-$CI_COMMIT_REF_NAME
- - mvn
+ - cd cn-admin && mvn package -Dxjar.password=$XJAR_PIN docker:build -DpushImage -DdockerImageTags=$CNWEB_TAG -DdockerImageName=192.168.40.153:9080/cyber-narrator/cn-web-$CI_COMMIT_REF_NAME:$CNWEB_TAG
only:
- tags
tags: