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

fix: ensure we respect quotes and dollar signs in config vars

Browse Source 
Due to various changes in how containers are started, these keys were set incorrectly for apps. Since we can use the short-hand --env=ENV format for setting env vars on docker containers, lets do so.

Closes #4895
Closes #4896
This commit is contained in:
Jose Diaz-Gonzalez
2021-11-03 12:13:33 -04:00
parent 6014b7208f
commit a756786f93
2 changed files with 42 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/config/docker-args-deploy
View File

@@ -7,25 +7,13 @@ source "$PLUGIN_AVAILABLE_PATH/config/functions"
trigger-config-docker-args() { trigger-config-docker-args() {
declare desc="config docker-args plugin trigger" declare desc="config docker-args plugin trigger"
declare trigger="docker-args" declare trigger="docker-args"
declare APP="$1" IMAGE_TAG="$2" declare APP="$1"
local ENV_ARGS IMAGE STDIN trigger local ENV_ARGS STDIN
IMAGE=$(get_app_image_name "$APP" "$IMAGE_TAG")
STDIN=$(cat) STDIN=$(cat)
trigger="$0 config_docker_args"
if is_image_cnb_based "$IMAGE"; then ENV_ARGS="$(config_export app "$APP" --format docker-args-keys --merged)"
ENV_ARGS="$(config_export app "$APP" --format docker-args-keys --merged)" echo -n "$STDIN $ENV_ARGS"
echo -n "$STDIN $ENV_ARGS"
return
fi
if ! is_image_herokuish_based "$IMAGE" "$APP"; then
ENV_ARGS="$(config_export app "$APP" --format docker-args --merged)"
echo -n "$STDIN $ENV_ARGS"
else
echo -n "$STDIN"
fi
} }
trigger-config-docker-args "$@" trigger-config-docker-args "$@"

40
tests/unit/config.bats
View File

@@ -169,7 +169,43 @@ teardown() {
} }
@test "(config) global config (herokuish)" { @test "(config) global config (herokuish)" {
deploy_app run /bin/bash -c "dokku config:set --global HASURA_GRAPHQL_JWT_SECRET='{ \"type\": \"HS256\", \"key\": \"347a4efd2dbb6b91aebf38db5dcf2c4e\" }'"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku config:set --global VAR='\$123*&456$'"
echo "output: $output"
echo "status: $status"
assert_success
run dokku trace:on
echo "output: $output"
echo "status: $status"
assert_success
run deploy_app
echo "output: $output"
echo "status: $status"
assert_success
run dokku trace:off
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku run $TEST_APP env | grep -E '^HASURA_GRAPHQL_JWT_SECRET='"
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains '{ "type": "HS256", "key": "347a4efd2dbb6b91aebf38db5dcf2c4e" }'
run /bin/bash -c "dokku run $TEST_APP env | grep -E '^VAR='"
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains '123*&456$'
run /bin/bash -c "dokku run $TEST_APP env | grep -E '^global_test=true'" run /bin/bash -c "dokku run $TEST_APP env | grep -E '^global_test=true'"
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
@@ -177,7 +213,7 @@ teardown() {
} }
@test "(config) global config (dockerfile)" { @test "(config) global config (dockerfile)" {
deploy_app dockerfile run deploy_app dockerfile
run /bin/bash -c "dokku run $TEST_APP env | grep -E '^global_test=true'" run /bin/bash -c "dokku run $TEST_APP env | grep -E '^global_test=true'"
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"