William/Docker_Grav
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dedicated push stage

Browse Source
This commit is contained in:
William Miceli
2019-05-15 13:49:22 -04:00
parent 0e47f99507
commit 17c58865b5
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
.gitlab-ci.yml
View File

@@ -6,6 +6,7 @@ services:
stages: stages:
- Base - Base
- Variants - Variants
- Push
variables: variables:
DOCKER_HOST: tcp://docker:2375/ DOCKER_HOST: tcp://docker:2375/
@@ -19,32 +20,45 @@ build-base:
- ./images/ - ./images/
except: except:
- pushes - pushes
only:
- master
tags: tags:
- docker - docker
before_script: before_script:
- docker info
- echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin
- mkdir ./images - mkdir ./images
script: script:
- docker build --pull --build-arg "GRAV_VERSION=$GRAV_VERSION" -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" -t "$CI_REGISTRY_IMAGE:$GRAV_VERSION" . - docker build --pull --build-arg "GRAV_VERSION=$GRAV_VERSION" -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" .
- docker push "$CI_REGISTRY_IMAGE:$GRAV_VERSION"
- docker save --output "./images/$CI_COMMIT_SHORT_SHA.tar" "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" - docker save --output "./images/$CI_COMMIT_SHORT_SHA.tar" "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA"
build-git: build-git:
stage: Variants stage: Variants
artifacts:
expire_in: 1 week
paths:
- ./images/
dependencies: dependencies:
- build-base - build-base
except: except:
- pushes - pushes
only: tags:
- master - docker
script:
- docker build --build-arg "CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA" -f ./variants/Dockerfile-git -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA-git" .
- docker save --output "./images/$CI_COMMIT_SHORT_SHA-git.tar" "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA"
push:
stage: Push
dependencies:
- build-base
- build-git
except:
- pushes
tags: tags:
- docker - docker
before_script: before_script:
- echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin
- docker load --input "./images/$CI_COMMIT_SHORT_SHA.tar" - docker load --input "./images/$CI_COMMIT_SHORT_SHA.tar"
- docker load --input "./images/$CI_COMMIT_SHORT_SHA-git.tar"
script: script:
- docker build --build-arg "CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA" -f ./variants/Dockerfile-git -t "$CI_REGISTRY_IMAGE:$GRAV_VERSION-git" . - docker tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" "$CI_REGISTRY_IMAGE:$GRAV_VERSION"
- docker tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA-git" "$CI_REGISTRY_IMAGE:$GRAV_VERSION-git"
- docker push "$CI_REGISTRY_IMAGE:$GRAV_VERSION"
- docker push "$CI_REGISTRY_IMAGE:$GRAV_VERSION-git" - docker push "$CI_REGISTRY_IMAGE:$GRAV_VERSION-git"