formatting and use docker caching

This commit is contained in:
Johannes Loher 2018-11-29 01:06:35 +01:00
parent 8a99f4564a
commit 36ba1da022

View file

@ -1,20 +1,22 @@
image: docker:stable image: docker:stable
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
build-master: build-master:
stage: build stage: build
script: script:
- docker build --pull -t "$CI_REGISTRY_IMAGE" . - docker pull $CI_REGISTRY_IMAGE:latest || true
- docker push "$CI_REGISTRY_IMAGE" - docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:latest .
- docker push $CI_REGISTRY_IMAGE
only: only:
- master - master
build: build:
stage: build stage: build
script: script:
- docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" . - docker pull $CI_REGISTRY_IMAGE:latest || true
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" - docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG .
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
except: except:
- master - master