Commit fdb3ca2b by shipengwei

Merge branch 'master' of git.aipark.com:eoc-group/dotnet-cicd-demo

parents 98ec55ec 8af055cc
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Official docker image. # Official docker image.
variables: variables:
BASE_VERSION: "1.0" BASE_VERSION: "1.0"
USER_NAME: "tcr$eoc" CI_REGISTRY_USER: "tcr$eoc"
CI_REGISTRY: "k8s-t0.tencentcloudcr.com" CI_REGISTRY: "k8s-t0.tencentcloudcr.com"
CI_REGISTRY_IMAGE: "k8s-t0.tencentcloudcr.com/eoc/dotnet-cicd-demo" CI_REGISTRY_IMAGE: "k8s-t0.tencentcloudcr.com/eoc/dotnet-cicd-demo"
...@@ -12,14 +12,14 @@ services: ...@@ -12,14 +12,14 @@ services:
- docker:dind - docker:dind
before_script: before_script:
- echo "$CI_REGISTRY_IMAGE" - echo $CI_REGISTRY_IMAGE
- FULLVERSION=$BASE_VERSION.$(date +"%y%m%d%H%M") - FULLVERSION=$BASE_VERSION.$(date +"%y%m%d%H%M")
- export FULLVERSION - export FULLVERSION
- echo $FULLVERSION - echo $FULLVERSION
- REGISTRY_IMAGE=$CI_REGISTRY_IMAGE:$FULLVERSION - REGISTRY_IMAGE=$CI_REGISTRY_IMAGE:$FULLVERSION
- docker login -u $USER_NAME -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
build-master-x86: build-master-x86:
stage: build stage: build
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment