diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2023-04-26 02:59:13 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2023-04-26 02:59:13 +0000 |
| commit | 3b2d7cc67f8ee7c727654cc0f2631611154184cd (patch) | |
| tree | 56ad4a815351e83ac09ea6331f33d681dadc706c | |
| parent | 6bd0df1357e25aaa845f86087fe433d86391ca18 (diff) | |
| parent | 47e95fe9f5732b26530045a4cfe81538249c64d3 (diff) | |
| download | pleroma-3b2d7cc67f8ee7c727654cc0f2631611154184cd.tar.gz pleroma-3b2d7cc67f8ee7c727654cc0f2631611154184cd.zip | |
Merge branch 'tusooa/kaniko' into 'develop'
Add ELIXIR_IMG arg to latest
See merge request pleroma/pleroma!3876
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | changelog.d/3876.skip | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d0b2bd998..154083c68 100644 --- 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 new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/changelog.d/3876.skip |