github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor: standardize on using long-form and equal sign for docker arguments

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2021-02-11 02:21:16 -05:00
parent 0963c403ab
commit 25ab915883
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/builder-herokuish/builder-build
View File

@@ -47,14 +47,14 @@ trigger-builder-herokuish-builder-build() {
plugn trigger pre-build-buildpack "$APP" "$SOURCECODE_WORK_DIR"
local DOCKER_ARGS=$(: | plugn trigger docker-args-build "$APP" "$BUILDER_TYPE")
[[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
[[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" --env=TRACE=true "
DOCKER_ARGS+=$(: | plugn trigger docker-args-process-build "$APP" "$BUILDER_TYPE")
declare -a ARG_ARRAY
eval "ARG_ARRAY=($DOCKER_ARGS)"
local DOKKU_CONTAINER_EXIT_CODE=0
local CID=$("$DOCKER_BIN" container create "${DOCKER_RUN_LABEL_ARGS[@]}" $DOKKU_GLOBAL_RUN_ARGS -v $DOKKU_APP_HOST_CACHE_DIR:/cache -e CACHE_PATH=/cache "${ARG_ARRAY[@]}" $IMAGE /build)
local CID=$("$DOCKER_BIN" container create "${DOCKER_RUN_LABEL_ARGS[@]}" $DOKKU_GLOBAL_RUN_ARGS -v $DOKKU_APP_HOST_CACHE_DIR:/cache --env=CACHE_PATH=/cache "${ARG_ARRAY[@]}" $IMAGE /build)
plugn trigger post-container-create "app" "$CID" "$APP" "build"
"$DOCKER_BIN" container start "$CID" >/dev/null || DOKKU_CONTAINER_EXIT_CODE=$?
"$DOCKER_BIN" container attach "$CID"

2
plugins/logs/triggers.go
View File

@@ -49,7 +49,7 @@ func TriggerDockerArgsProcessDeploy(appName string) error {
}
if maxSize != "unlimited" {
fmt.Printf(" --log-opt max-size=%s ", maxSize)
fmt.Printf(" --log-opt=max-size=%s ", maxSize)
}
}

6
plugins/scheduler-docker-local/scheduler-deploy
View File

@@ -73,11 +73,11 @@ trigger-scheduler-docker-local-scheduler-deploy() {
local DOCKER_ARGS
DOCKER_ARGS=$(: | plugn trigger docker-args-deploy "$APP" "$IMAGE_TAG" "$PROC_TYPE" "$CONTAINER_INDEX")
DOCKER_ARGS+=" --label=com.dokku.process-type=$PROC_TYPE --label=com.dokku.dyno=$DYNO "
DOCKER_ARGS+=" -e DYNO=$DYNO "
DOCKER_ARGS+=" --env=DYNO=$DYNO "
DOCKER_ARGS+=" --init "
DOCKER_ARGS+=" $DOCKER_RUN_LABEL_ARGS $DOKKU_GLOBAL_RUN_ARGS "
DOCKER_ARGS+=$(: | plugn trigger docker-args-process-deploy "$APP" "$IMAGE_SOURCE_TYPE" "$IMAGE_TAG" "$PROC_TYPE" "$CONTAINER_INDEX")
[[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
[[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" --env=TRACE=true "
local START_CMD
[[ "$DOKKU_HEROKUISH" == "true" ]] && START_CMD="/start $PROC_TYPE"
@@ -98,7 +98,7 @@ trigger-scheduler-docker-local-scheduler-deploy() {
done
fi
DOCKER_ARGS+=" --env PORT=$DOKKU_PORT "
DOCKER_ARGS+=" --env=PORT=$DOKKU_PORT "
START_CMD=$(fn-scheduler-docker-local-extract-start-cmd "$APP" "$PROC_TYPE" "$START_CMD" "$DOKKU_HEROKUISH" "$DOKKU_PORT")
# shellcheck disable=SC2086
cid=$("$DOCKER_BIN" container create $DOCKER_ARGS $IMAGE $START_CMD)

6
tests/unit/logs.bats
View File

@@ -385,7 +385,7 @@ teardown() {
echo "output: $output"
echo "status: $status"
assert_success
assert_output "--log-opt max-size=20m"
assert_output "--log-opt=max-size=20m"
run /bin/bash -c "dokku docker-options:add $TEST_APP deploy --log-driver=local" 2>&1
echo "output: $output"
@@ -396,7 +396,7 @@ teardown() {
echo "output: $output"
echo "status: $status"
assert_success
assert_output "--log-opt max-size=20m"
assert_output "--log-opt=max-size=20m"
run /bin/bash -c "dokku docker-options:add $TEST_APP deploy --log-driver=json-file" 2>&1
echo "output: $output"
@@ -407,7 +407,7 @@ teardown() {
echo "output: $output"
echo "status: $status"
assert_success
assert_output "--log-opt max-size=20m"
assert_output "--log-opt=max-size=20m"
run /bin/bash -c "dokku docker-options:add $TEST_APP deploy --log-driver=journald" 2>&1
echo "output: $output"