From 8660d58eb0cbac8376ec243e9e50379022e83a9b Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 25 Mar 2021 22:14:53 -0400 Subject: [PATCH] fix: inject alternate label when building from an image This label is otherwise missing, causing tooling that might want to know about it's pre-existing labels - specifically, docker-image-labeler - to fail to run as expected. --- plugins/git/internal-functions | 3 ++- tests/unit/git_4.bats | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/git/internal-functions b/plugins/git/internal-functions index 867d25c1f..54bf7e8dc 100755 --- a/plugins/git/internal-functions +++ b/plugins/git/internal-functions @@ -167,7 +167,8 @@ cmd-git-from-image() { dokku_log_verbose "Setting Dockerfile" touch "$TMP_WORK_DIR/Dockerfile" - echo "FROM $DOCKER_IMAGE" >"$TMP_WORK_DIR/Dockerfile" + echo "FROM $DOCKER_IMAGE" >>"$TMP_WORK_DIR/Dockerfile" + echo "LABEL com.dokku.docker-image-labeler/alternate-tags=\"[\"linuxserver/foldingathome:7.5.1-ls1\"]\"" >>"$TMP_WORK_DIR/Dockerfile" plugn trigger git-from-directory "$APP" "$TMP_WORK_DIR" "$USER_NAME" "$USER_EMAIL" } diff --git a/tests/unit/git_4.bats b/tests/unit/git_4.bats index d66454ad5..6d26de148 100644 --- a/tests/unit/git_4.bats +++ b/tests/unit/git_4.bats @@ -123,7 +123,7 @@ EOF echo "status: $status" assert_success - run /bin/bash -c "docker image inspect dokku/$TEST_APP:latest | grep 'alternate-tags'" + run /bin/bash -c "docker image inspect dokku/$TEST_APP:latest --format '{{ index .Config.Labels \"com.dokku.docker-image-labeler/alternate-tags\" }}'" echo "output: $output" echo "status: $status" assert_success