pwarren/zmk_mf68
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Tweaks to when we do docker job.

Browse source
This commit is contained in:
Pete Johanson 2020-05-11 11:38:04 -04:00
parent b67c479f70
commit c5e4eea3fd
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.gitlab-ci.yml
View file

@ -22,11 +22,16 @@ build:dockerimage:
image: docker:stable image: docker:stable
rules:
- if: '$CI_COMMIT_REF_SLUG =~ /^docker/'
when: always
before_script: before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
script: script:
- docker pull $CI_BUILD_IMAGE:latest || true - docker pull $CI_BUILD_IMAGE:latest || true
- docker build --cache-from $CI_BUILD_IMAGE:latest -t $CI_BUILD_IMAGE:latest . - docker build --cache-from $CI_BUILD_IMAGE:latest -t $CI_BUILD_IMAGE:$CI_COMMIT_SHORT_SHA .
- docker push $CI_BUILD_IMAGE:latest - docker push $CI_BUILD_IMAGE:$CI_COMMIT_SHORT_SHA
- docker tag $CI_BUILD_IMAGE:$CI_COMMIT_SHORT_SHA $CI_BUILD_IMAGE:latest && git push $CI_BUILD_IMAGE:latest
- if [ -n "$CI_COMMIT_TAG" ]; then docker tag $CI_BUILD_IMAGE:$CI_COMMIT_SHORT_SHA $CI_BUILD_IMAGE:$CI_COMMIT_TAG && docker push $CI_BUILD_IMAGE:$CI_COMMIT_TAG; fi