Commit 9e05203c by shipengwei

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

parents f4b8feea 6501e763
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Official docker image. # Official docker image.
variables: variables:
BASEVERSION: "1.0" BASEVERSION: "1.0"
DATAVERSION: "$(date +%Y%m%d%H%M)" DATAVERSION: $(date +%Y%m%d%H%M)
FULLVERSION: "${BASEVERSION}.${DATAVERSION}" FULLVERSION: "${BASEVERSION}.${DATAVERSION}"
CI_REGISTRY_IMAGE: "k8s-t0.tencentcloudcr.com/eoc/dotnet-cicd-demo" CI_REGISTRY_IMAGE: "k8s-t0.tencentcloudcr.com/eoc/dotnet-cicd-demo"
...@@ -20,7 +20,7 @@ before_script: ...@@ -20,7 +20,7 @@ before_script:
build-master-x86: build-master-x86:
stage: build stage: build
script: script:
- docker build --pull -t $CI_REGISTRY_IMAGE:$FULLVERSION-amd64 . -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
only: only:
- master - master
...@@ -30,7 +30,7 @@ build-master-x86: ...@@ -30,7 +30,7 @@ build-master-x86:
build-master-arm64: build-master-arm64:
stage: build stage: build
script: script:
- docker build --pull -t $CI_REGISTRY_IMAGE:$FULLVERSION-arm64 . --platform linux/arm64 - docker build --pull -t $CI_REGISTRY_IMAGE:$FULLVERSION-arm64 .
- docker push $CI_REGISTRY_IMAGE:$FULLVERSION - docker push $CI_REGISTRY_IMAGE:$FULLVERSION
only: only:
- master - master
......
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