From 25ab915883c976d58793e44651955b739a0d9821 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Thu, 11 Feb 2021 02:21:16 -0500
Subject: [PATCH] refactor: standardize on using long-form and equal sign for
 docker arguments

---
 plugins/builder-herokuish/builder-build         | 4 ++--
 plugins/logs/triggers.go                        | 2 +-
 plugins/scheduler-docker-local/scheduler-deploy | 6 +++---
 tests/unit/logs.bats                            | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugins/builder-herokuish/builder-build b/plugins/builder-herokuish/builder-build
index b3b67465f..74d989cc7 100755
--- a/plugins/builder-herokuish/builder-build
+++ b/plugins/builder-herokuish/builder-build
@@ -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"
diff --git a/plugins/logs/triggers.go b/plugins/logs/triggers.go
index fdadb55b7..31c829b50 100644
--- a/plugins/logs/triggers.go
+++ b/plugins/logs/triggers.go
@@ -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)
 		}
 	}
 
diff --git a/plugins/scheduler-docker-local/scheduler-deploy b/plugins/scheduler-docker-local/scheduler-deploy
index f487a4920..67c45dc9b 100755
--- a/plugins/scheduler-docker-local/scheduler-deploy
+++ b/plugins/scheduler-docker-local/scheduler-deploy
@@ -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)
diff --git a/tests/unit/logs.bats b/tests/unit/logs.bats
index f0ec2747e..70677b00e 100644
--- a/tests/unit/logs.bats
+++ b/tests/unit/logs.bats
@@ -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"