From 8e4dc1c2d0b4f19a4adb61b1ad233279c0c06b77 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 18 Feb 2020 01:32:26 -0500 Subject: [PATCH] feat: label released images This will allow us to properly handle cases where the labeled image isn't actually the correct image due to invalid builds. --- plugins/builder-dockerfile/builder-release | 1 + plugins/builder-herokuish/builder-release | 2 ++ 2 files changed, 3 insertions(+) diff --git a/plugins/builder-dockerfile/builder-release b/plugins/builder-dockerfile/builder-release index 7b8cef709..8f3ac4cbc 100755 --- a/plugins/builder-dockerfile/builder-release +++ b/plugins/builder-dockerfile/builder-release @@ -13,6 +13,7 @@ trigger-builder-dockerfile-builder-release() { # buildstep plugins don't necessarily make sense for dockerfiles. call the new breed!!! plugn trigger pre-release-dockerfile "$APP" "$IMAGE_TAG" + echo "FROM $IMAGE" | docker build --label=com.dokku.image-stage=release -t "$IMAGE" - plugn trigger post-release-dockerfile "$APP" "$IMAGE_TAG" } diff --git a/plugins/builder-herokuish/builder-release b/plugins/builder-herokuish/builder-release index 762b5f619..f7b552e14 100755 --- a/plugins/builder-herokuish/builder-release +++ b/plugins/builder-herokuish/builder-release @@ -36,6 +36,8 @@ trigger-builder-herokuish-builder-release() { "$DOCKER_BIN" container commit "${DOCKER_COMMIT_LABEL_ARGS[@]}" "$CID" "$IMAGE" >/dev/null fi + + echo "FROM $IMAGE" | docker build --label=com.dokku.image-stage=release -t "$IMAGE" - plugn trigger post-release-buildpack "$APP" "$IMAGE_TAG" }