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

Merge pull request #4228 from Cellane/patch-1

Browse Source 
Fix tags:deploy command for images that contain ONBUILD directive
This commit is contained in:
Jose Diaz-Gonzalez
2020-12-13 03:14:03 -05:00
committed by GitHub
parent ca2de6a4a3 f2a3cfc0b4
commit 946c424734
2 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/builder-dockerfile/builder-release
View File

@@ -15,7 +15,11 @@ trigger-builder-dockerfile-builder-release() {
plugn trigger pre-release-dockerfile "$APP" "$IMAGE_TAG"
local IMAGE=$(get_app_image_name "$APP" "$IMAGE_TAG")
echo "FROM $IMAGE" | suppress_output "$DOCKER_BIN" image build --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 -t "$IMAGE" -
if "$DOCKER_BIN" image history --format "{{ json . }}" "$IMAGE" | grep -q "ONBUILD"; then
dokku_log_warn "Image contains one or more ONBUILD directives, skipping label injection"
else
echo "FROM $IMAGE" | suppress_output "$DOCKER_BIN" image build --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 -t "$IMAGE" -
fi
plugn trigger post-release-dockerfile "$APP" "$IMAGE_TAG"
}

37
tests/unit/tags.bats
View File

@@ -4,7 +4,7 @@ load test_helper
setup() {
global_setup
deploy_app
create_app
}
teardown() {
@@ -20,10 +20,16 @@ teardown() {
}
@test "(tags) tags:create, tags, tags:destroy" {
run deploy_app
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku tags:create $TEST_APP v0.9.0"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku tags $TEST_APP | grep -q -E 'v0.9.0'"
echo "output: $output"
echo "status: $status"
@@ -40,6 +46,11 @@ teardown() {
}
@test "(tags) tags:deploy" {
run deploy_app
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku tags:create $TEST_APP v0.9.0"
echo "output: $output"
echo "status: $status"
@@ -64,3 +75,27 @@ teardown() {
echo "status: $status"
assert_failure
}
@test "(tags) tags:deploy (onbuild)" {
run /bin/bash -c "docker image pull gliderlabs/logspout:v3.2.13"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "docker image tag gliderlabs/logspout:v3.2.13 dokku/$TEST_APP:3.2.13"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku storage:mount $TEST_APP /var/run/docker.sock:/var/run/docker.sock"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku tags:deploy $TEST_APP 3.2.13"
echo "output: $output"
echo "status: $status"
assert_output_contains "Image contains one or more ONBUILD directives, skipping label injection"
assert_output_contains "COPY failed" 0
assert_success
}