pleroma

commit: 18913c4cd8bebc6391612f472330a008ce30a19b
parent 3b2d7cc67f8ee7c727654cc0f2631611154184cd
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Wed, 26 Apr 2023 11:43:46 +0000

Merge branch 'tusooa/combine-login' into 'develop'

Work around docker login needing daemon

See merge request pleroma/pleroma!3877
Diffstat:
M
.gitlab-ci.yml
3
++-
A
changelog.d/3877.skip
0

2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -510,7 +510,8 @@ kaniko-release:linux/arm:
     - 'IMAGES_SLUG=; for arch in $BUILD_ARCHES; do IMAGES_SLUG="$IMAGES_SLUG $CI_REGISTRY_IMAGE/$arch:$CI_COMMIT_REF_SLUG"; done'
     - 'IMAGES_LATEST=; for arch in $BUILD_ARCHES; do IMAGES_LATEST="$IMAGES_LATEST $CI_REGISTRY_IMAGE/$arch:latest"; done'
     - 'IMAGES_LATEST_STABLE=; for arch in $BUILD_ARCHES; do IMAGES_LATEST_STABLE="$IMAGES_LATEST_STABLE $CI_REGISTRY_IMAGE/$arch:latest"; done'
-    - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY --username $CI_REGISTRY_USER --password-stdin
+    - mkdir -p ~/.docker
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > ~/.docker/config.json
 
 docker-combine:latest:
   extends: .docker-combine
diff --git a/changelog.d/3877.skip b/changelog.d/3877.skip