commit: 3b2d7cc67f8ee7c727654cc0f2631611154184cd
parent 6bd0df1357e25aaa845f86087fe433d86391ca18
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Wed, 26 Apr 2023 02:59:13 +0000
Merge branch 'tusooa/kaniko' into 'develop'
Add ELIXIR_IMG arg to latest
See merge request pleroma/pleroma!3876
Diffstat:
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -404,7 +404,7 @@ arm64-musl:
only:
- develop@pleroma/pleroma
script:
- - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --custom-platform=$BUILD_ARCH --build-arg VCS_REF=$CI_VCS_REF --build-arg BUILD_DATE=$CI_JOB_TIMESTAMP --destination $IMAGE_TAG --destination $IMAGE_TAG_SLUG --destination $IMAGE_TAG_LATEST
+ - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --custom-platform=$BUILD_ARCH --build-arg VCS_REF=$CI_VCS_REF --build-arg BUILD_DATE=$CI_JOB_TIMESTAMP --build-arg ELIXIR_IMG=$ELIXIR_IMG --destination $IMAGE_TAG --destination $IMAGE_TAG_SLUG --destination $IMAGE_TAG_LATEST
.kaniko-stable:
extends: .kaniko
diff --git a/changelog.d/3876.skip b/changelog.d/3876.skip