diff options
| author | feld <feld@feld.me> | 2020-01-15 22:52:53 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-01-15 22:52:53 +0000 |
| commit | 52a0bf62f51d689cdc6f108cbefcb244a4a3737f (patch) | |
| tree | c2f7f91d90e46fa3fb0c5fd33382d2eb0ce707bf | |
| parent | 6317183acd767ba0ae1a245119d0276696444d92 (diff) | |
| parent | 1e17ad2275d102bd7e3a255989f22cfbbd065ada (diff) | |
| download | pleroma-52a0bf62f51d689cdc6f108cbefcb244a4a3737f.tar.gz pleroma-52a0bf62f51d689cdc6f108cbefcb244a4a3737f.zip | |
Merge branch 'ci/docker-imaging' into 'develop'
ci/docker imaging
See merge request pleroma/pleroma!2110
| -rw-r--r-- | .gitlab-ci.yml | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b2601082..5d0d3316a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -281,19 +281,19 @@ docker: IMAGE_TAG_LATEST_STABLE: $CI_REGISTRY_IMAGE:latest-stable before_script: &before-docker - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY + - docker pull $IMAGE_TAG_SLUG || true - export CI_JOB_TIMESTAMP=$(date --utc -Iseconds) - export CI_VCS_REF=$CI_COMMIT_SHORT_SHA allow_failure: true script: - - docker pull $IMAGE_TAG_SLUG || true - - docker build --cache-from $IMAGE_TAG_SLUG --build-arg VCS_REF=$CI_VCS_REF --build-arg BUILD_DATE=$CI_JOB_TIMESTAMP -t $IMAGE_TAG -t $IMAGE_TAG_SLUG -t $IMAGE_TAG_LATEST . + - docker build --cache-from $IMAGE_TAG_SLUG --build-arg VCS_REF=$CI_VCS_REF --build-arg BUILD_DATE=$CI_JOB_TIMESTAMP -t $IMAGE_TAG -t $IMAGE_TAG_SLUG -t $IMAGE_TAG_LATEST . - docker push $IMAGE_TAG - docker push $IMAGE_TAG_SLUG - docker push $IMAGE_TAG_LATEST tags: - dind only: - - develop + - develop@pleroma/pleroma docker-stable: stage: docker @@ -304,12 +304,28 @@ docker-stable: before_script: *before-docker allow_failure: true script: - - docker pull $IMAGE_TAG_SLUG || true - - docker build --cache-from $IMAGE_TAG_SLUG --build-arg VCS_REF=$CI_VCS_REF --build-arg BUILD_DATE=$CI_JOB_TIMESTAMP -t $IMAGE_TAG -t $IMAGE_TAG_SLUG -t $IMAGE_TAG_LATEST_STABLE . + - docker build --cache-from $IMAGE_TAG_SLUG --build-arg VCS_REF=$CI_VCS_REF --build-arg BUILD_DATE=$CI_JOB_TIMESTAMP -t $IMAGE_TAG -t $IMAGE_TAG_SLUG -t $IMAGE_TAG_LATEST_STABLE . - docker push $IMAGE_TAG - docker push $IMAGE_TAG_SLUG - docker push $IMAGE_TAG_LATEST_STABLE tags: - dind only: - - stable + - stable@pleroma/pleroma + +docker-release: + stage: docker + image: docker:latest + cache: {} + dependencies: [] + variables: *docker-variables + before_script: *before-docker + allow_failure: true + script: + - docker build --cache-from $IMAGE_TAG_SLUG --build-arg VCS_REF=$CI_VCS_REF --build-arg BUILD_DATE=$CI_JOB_TIMESTAMP -t $IMAGE_TAG -t $IMAGE_TAG_SLUG . + - docker push $IMAGE_TAG + - docker push $IMAGE_TAG_SLUG + tags: + - dind + only: + - /^release/.*$/@pleroma/pleroma |