Merge pull request #4493 from Cellane/add-failing-test-for-image-labeling
Ensure alternate-tags is properly injected for git:from-image deploys
This commit is contained in:
2 files changed
+15
-1
No files matched your search
@@ -167,7 +167,8 @@ cmd-git-from-image() {
|
|||||||
|
|
||||||
dokku_log_verbose "Setting Dockerfile"
|
dokku_log_verbose "Setting Dockerfile"
|
||||||
touch "$TMP_WORK_DIR/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"
|
plugn trigger git-from-directory "$APP" "$TMP_WORK_DIR" "$USER_NAME" "$USER_EMAIL"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -116,3 +116,16 @@ EOF
|
|||||||
echo "status: $status"
|
echo "status: $status"
|
||||||
assert_failure
|
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"
|
||||||
|
}
|
||||||
Reference in new issue
Block a user