Commit 515061eb by shipengwei

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

parents 15ca0053 56420910
...@@ -13,7 +13,7 @@ services: ...@@ -13,7 +13,7 @@ services:
before_script: before_script:
- echo "$CI_REGISTRY_IMAGE" - echo "$CI_REGISTRY_IMAGE"
- echo "$CI_COMMIT_REF_SLUG" - echo "$CI_COMMIT_REF_SLUG"
- 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
- docker login -u 'tcr$eoc' -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u 'tcr$eoc' -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
...@@ -22,7 +22,7 @@ build-master-x86: ...@@ -22,7 +22,7 @@ build-master-x86:
stage: build stage: build
script: script:
- docker build -t $CI_REGISTRY_IMAGE:$FULLVERSION-amd64 . --pull -f Dockerfile --platform linux/amd64 - docker build -t $CI_REGISTRY_IMAGE:$FULLVERSION-amd64 . --pull -f Dockerfile --platform linux/amd64
- docker push $CI_REGISTRY_IMAGE:$FULLVERSION - docker push $CI_REGISTRY_IMAGE:$FULLVERSION-amd64
only: only:
- master - master
tags: tags:
...@@ -32,7 +32,7 @@ build-master-arm64: ...@@ -32,7 +32,7 @@ build-master-arm64:
stage: build stage: build
script: script:
- docker build --pull -t $CI_REGISTRY_IMAGE:$FULLVERSION-arm64 . - docker build --pull -t $CI_REGISTRY_IMAGE:$FULLVERSION-arm64 .
- docker push $CI_REGISTRY_IMAGE:$FULLVERSION - docker push $CI_REGISTRY_IMAGE:$FULLVERSION-arm64
only: only:
- master - master
tags: tags:
......
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