diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2023-04-26 11:43:46 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2023-04-26 11:43:46 +0000 |
| commit | 18913c4cd8bebc6391612f472330a008ce30a19b (patch) | |
| tree | 2ef151761b131bb110ca86bb83b2bf78faab661f | |
| parent | 3b2d7cc67f8ee7c727654cc0f2631611154184cd (diff) | |
| parent | 1a50db36d3f40d25525128a45adc23038525d882 (diff) | |
| download | pleroma-18913c4cd8bebc6391612f472330a008ce30a19b.tar.gz pleroma-18913c4cd8bebc6391612f472330a008ce30a19b.zip | |
Merge branch 'tusooa/combine-login' into 'develop'
Work around docker login needing daemon
See merge request pleroma/pleroma!3877
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | changelog.d/3877.skip | 0 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 154083c68..72ac4981d 100644 --- 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 new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/changelog.d/3877.skip |