Commit 89e8c632 by shipengwei

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

parents 53e200df 97cc0157
...@@ -10,15 +10,13 @@ services: ...@@ -10,15 +10,13 @@ services:
- docker:dind - docker:dind
before_script: before_script:
- echo >>> Image $CI_REGISTRY_IMAGE
- echo >>> Version $CI_COMMIT_REF_SLUG
- docker login -u 'tcr$eoc' -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u 'tcr$eoc' -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
build-master: build-master:
stage: build stage: build
script: script:
- docker build --pull -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG . - docker build --pull -t $CI_REGISTRY_IMAGE .
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG - docker push $CI_REGISTRY_IMAGE
only: only:
- master - master
...@@ -27,5 +25,5 @@ build: ...@@ -27,5 +25,5 @@ build:
script: script:
- docker build --pull -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG . - docker build --pull -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG .
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
except: # except:
- 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