Mirrors/dokku
1
0
Fork 0
mirror of https://github.com/dokku/dokku.git synced 2025-12-28 16:06:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4493 from Cellane/add-failing-test-for-image-labeling

Browse Source 
Ensure alternate-tags is properly injected for git:from-image deploys
This commit is contained in:
Jose Diaz-Gonzalez
2021-04-16 14:37:55 -04:00
committed by GitHub
parent 6d66590fd4 8660d58eb0
commit 7847c8b99c
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/git/internal-functions
View File

@@ -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"
}

13
tests/unit/git_4.bats
View File

@@ -116,3 +116,16 @@ EOF
echo "status: $status"
assert_failure
}
@test "(git) git:from-image labels correctly" {
run /bin/bash -c "dokku git:from-image $TEST_APP linuxserver/foldingathome:7.5.1-ls1"
echo "output: $output"
echo "status: $status"
assert_success
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
assert_output_contains "linuxserver/foldingathome:7.5.1-ls1"
}