6 Commits

Author SHA1 Message Date
f84eb3ce70 retrigger dockerhub build 2020-12-29 00:52:45 +01:00
f576588ec0 Trigger dockerhub build 2020-12-29 00:51:22 +01:00
0ae229792c Ignore .git in docker image 2020-12-29 00:45:16 +01:00
4e69e3d50b Try dockerhub again
There were protected variables involved...
2020-12-29 00:41:53 +01:00
059a24d638 Try to force dockerhub push 2020-12-29 00:30:52 +01:00
45071f0faa Add comments to registry jobs 2020-12-29 00:19:19 +01:00
2 changed files with 9 additions and 8 deletions

View File

@@ -1,4 +1,6 @@
.git/
.gitlab-ci.yml
# CI cache folder storing docker images
ci-exports/
.gitlab-ci.yml

View File

@@ -23,16 +23,15 @@ variables:
# Use TLS https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled
DOCKER_HOST: tcp://docker:2376
services:
- docker:19.03.12-dind
.docker_cache:
cache:
key: "$CI_COMMIT_REF_SLUG"
paths:
- ci-exports/*.tar
services:
- docker:19.03.12-dind
# Make sure we can build a docker image
# It's pushed to the pipeline-local registry which acts as a cache
build_docker:
@@ -46,13 +45,13 @@ build_docker:
- mkdir -p ci-exports/
- docker save $CI_REGISTRY_IMAGE:latest > ci-exports/$CI_COMMIT_REF_SLUG.tar
# Publishes the configured CI registry (by default that's gitlab's registry)
push_ci_registry:
extends:
- .docker_cache
stage: docker_push
cache:
policy: pull
# Login to job registry and publish registry
before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
script:
@@ -63,20 +62,19 @@ push_ci_registry:
only:
refs:
- master
- tags
variables:
- $CI_REGISTRY_USER
- $CI_REGISTRY_PASSWORD
- $CI_REGISTRY
- $CI_REGISTRY_IMAGE
# Publishes the cached image to docker
push_dockerhub_registry:
extends:
- .docker_cache
stage: docker_push
cache:
policy: pull
# Login to job registry and publish registry
before_script:
- docker login -u $DOCKERHUB_REGISTRY_USER -p $DOCKERHUB_REGISTRY_PASSWORD $DOCKERHUB_REGISTRY
script:
@@ -85,6 +83,7 @@ push_dockerhub_registry:
- docker tag $CI_REGISTRY_IMAGE:latest $DOCKERHUB_REGISTRY_IMAGE:latest
- docker push $DOCKERHUB_REGISTRY_IMAGE:$CI_COMMIT_TAG
- docker push $DOCKERHUB_REGISTRY_IMAGE:latest
# TODO: Use rules https://docs.gitlab.com/ee/ci/yaml/README.html#rules
only:
refs:
# - master