From 5cfe7610b2bdeeb48cc5391677ef08a5a06b069b Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sat, 9 Oct 2021 15:05:24 -0400
Subject: [PATCH] refactor: inject labels in builder-dockerfile using
 dockerfile

While this is slower, it ensures we have a proper image parent and can track images for retirement correctly.
---
 plugins/builder-dockerfile/builder-release            | 11 ++++++++++-
 .../dockerfiles/builder-release.Dockerfile            |  2 ++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 plugins/builder-dockerfile/dockerfiles/builder-release.Dockerfile

diff --git a/plugins/builder-dockerfile/builder-release b/plugins/builder-dockerfile/builder-release
index 18dcf49f8..497e5146b 100755
--- a/plugins/builder-dockerfile/builder-release
+++ b/plugins/builder-dockerfile/builder-release
@@ -12,10 +12,19 @@ trigger-builder-dockerfile-builder-release() {
     return
   fi
 
+  local DOCKER_BUILD_LABEL_ARGS="--label=org.label-schema.schema-version=1.0 --label=org.label-schema.vendor=dokku --label=com.dokku.app-name=$APP  --label=com.dokku.image-stage=release --label=dokku"
+
   plugn trigger pre-release-dockerfile "$APP" "$IMAGE_TAG"
 
+  TMP_WORK_DIR="$(mktemp -d "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")"
+  trap "rm -rf '$TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT
+
   local IMAGE=$(get_app_image_name "$APP" "$IMAGE_TAG")
-  docker-image-labeler --label=com.dokku.image-stage=release --label=com.dokku.app-name=$APP --label=org.label-schema.schema-version=1.0 --label=org.label-schema.vendor=dokku --label=dokku "$IMAGE"
+  if ! suppress_output "$DOCKER_BIN" image build "${DOCKER_BUILD_LABEL_ARGS[@]}" $DOKKU_GLOBAL_BUILD_ARGS -f "$PLUGIN_AVAILABLE_PATH/builder-dockerfile/dockerfiles/builder-release.Dockerfile" --build-arg APP_IMAGE="$IMAGE" -t $IMAGE "$TMP_WORK_DIR"; then
+    dokku_log_warn "Failure injecting docker labels on image"
+    return 1
+  fi
+
   plugn trigger post-release-dockerfile "$APP" "$IMAGE_TAG"
   plugn trigger post-release-builder "$BUILDER_TYPE" "$APP" "$IMAGE"
 }
diff --git a/plugins/builder-dockerfile/dockerfiles/builder-release.Dockerfile b/plugins/builder-dockerfile/dockerfiles/builder-release.Dockerfile
new file mode 100644
index 000000000..cca256f21
--- /dev/null
+++ b/plugins/builder-dockerfile/dockerfiles/builder-release.Dockerfile
@@ -0,0 +1,2 @@
+ARG APP_IMAGE
+FROM $APP_IMAGE