diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-09-21 22:04:59 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-09-21 22:04:59 +0000 |
| commit | d86b10a5e33d9045c93d0b94cb5aca18f5790d63 (patch) | |
| tree | 9548dfe6cbe36d8391fa4fdef2a3b8d9a088621d | |
| parent | 6b3842cf50c063a63980c8d4dca93b25424059f2 (diff) | |
| parent | 36df37e05638749317a80071b9ed231a22224c0c (diff) | |
Merge branch 'dockerfix' into 'develop'
Docker fix
See merge request pleroma/pleroma!3526
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3ac30b13d..0f14b1aa1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -351,8 +351,8 @@ docker: IMAGE_TAG_SLUG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG IMAGE_TAG_LATEST: $CI_REGISTRY_IMAGE:latest IMAGE_TAG_LATEST_STABLE: $CI_REGISTRY_IMAGE:latest-stable - DOCKER_BUILDX_URL: https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.linux-amd64 - DOCKER_BUILDX_HASH: 71a7d01439aa8c165a25b59c44d3f016fddbd98b + DOCKER_BUILDX_URL: https://github.com/docker/buildx/releases/download/v0.6.3/buildx-v0.6.3.linux-amd64 + DOCKER_BUILDX_HASH: 980e6b9655f971991fbbb5fd6cd19f1672386195 before_script: &before-docker - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker pull $IMAGE_TAG_SLUG || true |