dokku · josegonzalez · Mar 18, 2024 · Aug 27, 2023 · Jan 30, 2024 · Feb 9, 2024
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -58,7 +58,7 @@ jobs:
           PACKER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Get changed files in the docs folder
         id: changed-files-specific
-        uses: tj-actions/changed-files@v42.1.0
+        uses: tj-actions/changed-files@v43.0.0
         with:
           files: contrib/images/digitalocean/**
       - name: Run `packer validate`

diff --git a/Makefile b/Makefile
@@ -75,9 +75,12 @@ go-clean:
 		fi ;\
 	done
 
-copyfiles:
-	$(MAKE) go-build || exit 1
+copydokku:
 	cp dokku /usr/local/bin/dokku
+	chmod 0755 /usr/local/bin/dokku
+
+copyfiles: copydokku
+	$(MAKE) go-build || exit 1
 	mkdir -p ${CORE_PLUGINS_PATH} ${PLUGINS_PATH}
 	rm -rf ${CORE_PLUGINS_PATH}/*
 	test -d ${CORE_PLUGINS_PATH}/enabled || PLUGIN_PATH=${CORE_PLUGINS_PATH} plugn init

diff --git a/contrib/dokku_client.sh b/contrib/dokku_client.sh
@@ -188,9 +188,14 @@ main() {
   [[ " storage:ensure-directory " == *" $CMD "* ]] && unset APP
   [[ "$CMD" =~ events*|plugin*|ssh-keys* ]] && unset APP
   [[ -n "$APP_ARG" ]] && [[ "$APP_ARG" == "--global" ]] && unset APP
-  [[ -n "$@" ]] && [[ -n "$APP" ]] && app_arg="--app $APP"
+  if [[ -n "$@" ]] && [[ -n "$APP" ]]; then
+    set -- "$APP" "$@"
+    set -- "--app" "$@"
+  fi
   # echo "ssh -o LogLevel=QUIET -p $DOKKU_PORT -t dokku@$DOKKU_REMOTE_HOST -- $app_arg $@"
-  ssh -o LogLevel=QUIET -p $DOKKU_PORT -t dokku@$DOKKU_REMOTE_HOST -- $app_arg $@ || {
+  local ssh_args=("-o" "LogLevel=QUIET" "-p" "$DOKKU_PORT" "-t" "dokku@$DOKKU_REMOTE_HOST" "--")
+  ssh_args+=("$@")
+  ssh "${ssh_args[@]}" || {
     ssh_exit_code="$?"
     echo " !     Failed to execute dokku command over ssh: exit code $?" 1>&2
     echo " !     If there was no output from Dokku, ensure your configured SSH Key can connect to the remote server" 1>&2

diff --git a/docs/_build/requirements.txt b/docs/_build/requirements.txt
@@ -3,7 +3,7 @@ click==8.1.7
 ghp-import==2.1.0
 importlib-metadata==7.0.2
 Jinja2==3.1.3
-Markdown>=3.2.1,<3.6
+Markdown>=3.2.1,<3.7
 MarkupSafe==2.1.5
 mergedeep==1.3.4
 mkdocs==1.5.3
@@ -20,4 +20,4 @@ pyyaml_env_tag==0.1
 six==1.16.0
 soupsieve==2.5
 watchdog==4.0.0
-zipp==3.17.0
+zipp==3.18.1
diff --git a/docs/appendices/0.34.0-migration-guide.md b/docs/appendices/0.34.0-migration-guide.md
@@ -0,0 +1,14 @@
+# 0.34.0 Migration Guide
+
+## Removals
+
+- The `disable-chown` property of the `scheduler-docker-local` plugin has been removed. Mounted paths will no longer have file permissions changed during the pre-deploy phase. Files baked into the container image for herokuish builds will always be owned by the correct user.
+- The `git:unlock` command has been removed. It was previously used to "unlock" a temporary directory that already existed. The directory the `git:unlock` command used to cleanup is now properly removed on exit of the `git:from-image` command.
+
+## Changes
+
+- The k3s scheduler now defaults to nginx as it's default proxy implementation. The traefik proxy implementation is still available, though users will need to set the global `ingress-class` k3s property to `traefik` via the following command:
+
+    ```shell
+    dokku scheduler-k3s:set --global ingress-class traefik
+    ```
diff --git a/docs/deployment/methods/git.md b/docs/deployment/methods/git.md
@@ -10,13 +10,12 @@ git:from-archive [--archive-type ARCHIVE_TYPE] <app> <archive-url> [<git-usernam
 git:from-image [--build-dir DIRECTORY] <app> <docker-image> [<git-username> <git-email>] # Updates an app's git repository with a given docker image
 git:generate-deploy-key                           # Generates a deploy ssh key
 git:load-image [--build-dir DIRECTORY] <app> <docker-image> [<git-username> <git-email>] # Updates an app's git repository with a docker image loaded from stdin
-git:sync [--build] <app> <repository> [<git-ref>] # Clone or fetch an app from remote git repo
+git:sync [--build|build-if-changes] <app> <repository> [<git-ref>] # Clone or fetch an app from remote git repo
 git:initialize <app>                              # Initialize a git repository for an app
 git:public-key                                    # Outputs the dokku public deploy key
 git:report [<app>] [<flag>]                       # Displays a git report for one or more apps
 git:set <app> <key> (<value>)                     # Set or clear a git property for an app
 git:status <app>                                  # Show the working tree status for an app
-git:unlock <app> [--force]                        # Removes previous git clone folder for new deployment
 ```
 
 Git-based deployment has been the traditional method of deploying applications in Dokku. As of v0.12.0, Dokku introduces a few ways to customize the experience of deploying via `git push`. A Git-based deployment currently supports building applications via:
@@ -158,6 +157,12 @@ By default, this command does not trigger an application build. To do so during
 dokku git:sync --build node-js-app https://github.com/heroku/node-js-getting-started.git
 ```
 
+When running `git:sync` without a reference, it may be useful to only build when there are changes. To do so, specify the `--build-if-changes` flag.
+
+```shell
+dokku git:sync --build-if-changes node-js-app https://github.com/heroku/node-js-getting-started.git
+```
+
 ### Initializing from private repositories
 
 > [!IMPORTANT]

diff --git a/docs/deployment/schedulers/docker-local.md b/docs/deployment/schedulers/docker-local.md
@@ -32,20 +32,6 @@ dokku scheduler:set node-js-app selected
 
 Many builders only produce amd64-compatible images. The docker-local scheduler will automatically detect these and run them via the `--platform=linux/amd64` on arm64 deploy targets.
 
-### Disabling chown of persistent storage
-
-The `scheduler-docker-local` plugin will ensure your storage mounts are owned by either `herokuishuser` or the overridden value you have set in `DOKKU_APP_USER`. You may disable this by running the following `scheduler-docker-local:set` command for your application:
-
-```shell
-dokku scheduler-docker-local:set node-js-app disable-chown true
-```
-
-Once set, you may re-enable it by setting a blank value for `disable-chown`:
-
-```shell
-dokku scheduler-docker-local:set node-js-app disable-chown
-```
-
 ### Disabling the init process
 
 The `scheduler-docker-local` injects an init process by default via the `--init`. For some apps - such as those where the built docker image uses S6 as the init - this may be undesirable and cause issues with process starts. You may disable this by running the following `scheduler-docker-local:set` command for your application:

diff --git a/docs/deployment/schedulers/k3s.md b/docs/deployment/schedulers/k3s.md
@@ -58,12 +58,12 @@ By default, Dokku will attempt to auto-detect the IP address of the server. In c
 dokku scheduler-k3s:initialize --server-ip 192.168.20.15
 ```
 
-Dokku's k3s integration natively uses `Traefik` as it's ingress load balancer via [Traefik's CRDs](https://doc.traefik.io/traefik/providers/kubernetes-crd/), but a cluster can be set to use `nginx` via the [ingress-nginx](https://github.com/kubernetes/ingress-nginx) project. Switching to nginx will result in any `nginx` plugin settings being respected, either by turning them into annotations or creating a custom server snippet.
+Dokku's k3s integration natively uses `nginx` as it's ingress load balancer via [ingress-nginx](https://github.com/kubernetes/ingress-nginx). Properties set by the `nginx` plugin will be respected, either by turning them into annotations or creating a custom server/location snippet that the `ingress-nginx` project can use.
 
-To change the ingress, set the `--ingress-class` flag:
+Dokku can also use Traefik on cluster initialization via the [Traefik's CRDs](https://doc.traefik.io/traefik/providers/kubernetes-crd/). To change the ingress, set the `--ingress-class` flag:
 
 ```shell
-dokku scheduler-k3s:initialize --ingress-class nginx
+dokku scheduler-k3s:initialize --ingress-class traefik
 ```
 
 ### Adding nodes to the cluster

diff --git a/docs/getting-started/upgrading/index.md b/docs/getting-started/upgrading/index.md
@@ -18,6 +18,7 @@ Docker releases updates periodically to their engine. We recommend reading their
 
 Before upgrading, check the migration guides to get comfortable with new features and prepare your deployment to be upgraded.
 
+- [Upgrading to 0.34](/docs/appendices/0.34.0-migration-guide.md)
 - [Upgrading to 0.33](/docs/appendices/0.33.0-migration-guide.md)
 - [Upgrading to 0.32](/docs/appendices/0.32.0-migration-guide.md)
 - [Upgrading to 0.31](/docs/appendices/0.31.0-migration-guide.md)

diff --git a/docs/networking/proxies/traefik.md b/docs/networking/proxies/traefik.md
@@ -116,16 +116,6 @@ dokku traefik:set --global log-level DEBUG
 
 After modifying, the Traefik container will need to be restarted.
 
-### Setting rule priority
-
-By default, app deployments will result in the newer traefik rules using a higher priority in order to have any newer rules respected by Traefik. Rule priorities will always increase according to the current unix timestamp. The priority may be fixed by setting the app-level `priority` property:
-
-```shell
-dokku traefik:set node-js-app priority 12345
-```
-
-After modifying, the app container will need to be recreated via a `ps:rebuild` or an app deployment.
-
 ### SSL Configuration
 
 The traefik plugin only supports automatic ssl certificates from it's letsencrypt integration. Managed certificates provided by the `certs` plugin are ignored.

diff --git a/docs/networking/proxy-management.md b/docs/networking/proxy-management.md
@@ -12,7 +12,7 @@ proxy:report [<app>] [<flag>]                       # Displays a proxy report fo
 proxy:set [<app>|--global] <proxy-type>                        # Set proxy type for app
 ```
 
-In Dokku 0.5.0, port proxying was decoupled from the `nginx-vhosts` plugin into the proxy plugin. Dokku 0.6.0 introduced the ability to map host ports to specific container ports. In the future this will allow other proxy software - such as HAProxy or Caddy - to be used in place of nginx.
+In Dokku 0.5.0, port proxying was decoupled from the `nginx-vhosts` plugin into the proxy plugin. Dokku 0.6.0 introduced the ability to map host ports to specific container ports. This allows other proxy software - such as HAProxy or Caddy - to be used in place of nginx.
 
 ## Usage
 

diff --git a/dokku b/dokku
@@ -55,7 +55,7 @@ export DOKKU_SYSTEM_USER=${DOKKU_SYSTEM_USER:="dokku"}
 export DOKKU_API_VERSION=1
 export DOKKU_NOT_IMPLEMENTED_EXIT=10
 export DOKKU_VALID_EXIT=0
-export DOKKU_PID="$BASHPID"
+export DOKKU_PID="${DOKKU_PID:=$$}"
 
 export DOKKU_LOGS_DIR=${DOKKU_LOGS_DIR:="/var/log/dokku"}
 export DOKKU_LOGS_HOST_DIR=${DOKKU_LOGS_HOST_DIR:=$DOKKU_LOGS_DIR}
@@ -88,8 +88,8 @@ fi
 ! has_tty && DOKKU_QUIET_OUTPUT=1
 
 if [[ $(id -un) != "dokku" ]]; then
-  unset TMP TMPDIR TEMP TEMPDIR
   if [[ ! $1 =~ plugin:* ]] && [[ $1 != "ssh-keys:add" ]] && [[ $1 != "ssh-keys:remove" ]] && [[ $1 != "scheduler-k3s:initialize" ]] && [[ $1 != "scheduler-k3s:uninstall" ]]; then
+    unset DOKKU_PID TMP TMPDIR TEMP TEMPDIR
     export SSH_USER=$(id -un)
     sudo -u dokku -E -H "$0" "$@"
     exit $?
@@ -106,15 +106,20 @@ fi
 
 if [[ -n "$SSH_ORIGINAL_COMMAND" ]]; then
   export -n SSH_ORIGINAL_COMMAND
-  if [[ $1 =~ config-* ]] || [[ $1 =~ docker-options* ]]; then
-    xargs $0 <<<$SSH_ORIGINAL_COMMAND
-    exit $?
-  else
+  exit_code=0
+  if [[ $1 =~ git-* ]] || [[ $1 =~ git:* ]]; then
     set -f
     $0 $SSH_ORIGINAL_COMMAND
+    exit_code=$?
+    set +f
+  else
+    readarray -t -O "${#ssh_arg_array[@]}" ssh_arg_array < <(printf '%s' "$SSH_ORIGINAL_COMMAND" | xargs -n 1)
+    set -f
+    $0 "${ssh_arg_array[@]}"
+    exit_code=$?
     set +f
-    exit $?
   fi
+  exit $exit_code
 fi
 
 if ! dokku_auth "$@"; then

diff --git a/plugins/00_dokku-standard/subcommands/report b/plugins/00_dokku-standard/subcommands/report
@@ -17,6 +17,10 @@ cmd-report() {
   dokku_log_info1 "uname: $(uname -a)"
   dokku_log_info1 "memory: "
   free -m | sed "s/^/       /"
+  dokku_log_info1 "disk utilization: "
+  df -h --type btrfs --type ext4 --type ext3 --type ext2 --type vfat --type iso9660 | sed "s/^/       /"
+  dokku_log_info1 "disk inode utilization: "
+  df -hi --type btrfs --type ext4 --type ext3 --type ext2 --type vfat --type iso9660 | sed "s/^/       /"
   dokku_log_info1 "docker version: "
   "$DOCKER_BIN" version | sed "s/^/       /"
   dokku_log_info1 "docker daemon info: "

diff --git a/plugins/20_events/install b/plugins/20_events/install
@@ -56,16 +56,12 @@ EOF
     cat >"$DOKKU_LOGROTATE_FILE" <<EOF
 $DOKKU_LOGS_DIR/*.log {
         daily
-        rotate 7
         missingok
-        notifempty
-        su syslog dokku
+        rotate 7
         compress
         delaycompress
-        postrotate
-                reload rsyslog &>/dev/null || true
-        endscript
-        create 664 syslog dokku
+        notifempty
+        copytruncate
 }
 EOF
 

diff --git a/plugins/app-json/functions.go b/plugins/app-json/functions.go
@@ -102,8 +102,11 @@ func getPhaseScript(appName string, phase string) (string, error) {
 func getReleaseCommand(appName string, image string) string {
 	processType := "release"
 	port := "5000"
-	b, _ := common.PlugnTriggerOutput("procfile-get-command", []string{appName, processType, port}...)
-	return strings.TrimSpace(string(b[:]))
+	results, _ := common.CallPlugnTrigger(common.PlugnTriggerInput{
+		Trigger: "procfile-get-command",
+		Args:    []string{appName, processType, port},
+	})
+	return results.StdoutContents()
 }
 
 func getDokkuAppShell(appName string) string {
@@ -114,13 +117,19 @@ func getDokkuAppShell(appName string) string {
 	ctx := context.Background()
 	errs, ctx := errgroup.WithContext(ctx)
 	errs.Go(func() error {
-		b, _ := common.PlugnTriggerOutput("config-get-global", []string{"DOKKU_APP_SHELL"}...)
-		globalShell = strings.TrimSpace(string(b[:]))
+		results, _ := common.CallPlugnTriggerWithContext(ctx, common.PlugnTriggerInput{
+			Trigger: "config-get-global",
+			Args:    []string{"DOKKU_APP_SHELL"},
+		})
+		globalShell = results.StdoutContents()
 		return nil
 	})
 	errs.Go(func() error {
-		b, _ := common.PlugnTriggerOutput("config-get", []string{appName, "DOKKU_APP_SHELL"}...)
-		appShell = strings.TrimSpace(string(b[:]))
+		results, _ := common.CallPlugnTriggerWithContext(ctx, common.PlugnTriggerInput{
+			Trigger: "config-get",
+			Args:    []string{appName, "DOKKU_APP_SHELL"},
+		})
+		appShell = results.StdoutContents()
 		return nil
 	})
 
@@ -204,17 +213,27 @@ func executeScript(appName string, image string, imageTag string, phase string)
 	}
 
 	var dockerArgs []string
-	if b, err := common.PlugnTriggerSetup("docker-args-deploy", []string{appName, imageTag}...).SetInput("").Output(); err == nil {
-		words, err := shellquote.Split(strings.TrimSpace(string(b[:])))
+	results, err := common.CallPlugnTrigger(common.PlugnTriggerInput{
+		Trigger: "docker-args-deploy",
+		Args:    []string{appName, imageTag},
+		Stdin:   strings.NewReader(""),
+	})
+	if err == nil {
+		words, err := shellquote.Split(results.StdoutContents())
 		if err != nil {
 			return err
 		}
 
 		dockerArgs = append(dockerArgs, words...)
 	}
 
-	if b, err := common.PlugnTriggerSetup("docker-args-process-deploy", []string{appName, imageSourceType, imageTag}...).SetInput("").Output(); err == nil {
-		words, err := shellquote.Split(strings.TrimSpace(string(b[:])))
+	results, err = common.CallPlugnTrigger(common.PlugnTriggerInput{
+		Trigger: "docker-args-process-deploy",
+		Args:    []string{appName, imageSourceType, imageTag},
+		Stdin:   strings.NewReader(""),
+	})
+	if err == nil {
+		words, err := shellquote.Split(results.StdoutContents())
 		if err != nil {
 			return err
 		}
@@ -398,12 +417,15 @@ func createdContainerID(appName string, dockerArgs []string, image string, comma
 	arguments = append(arguments, image)
 	arguments = append(arguments, command...)
 
-	b, err := common.PlugnTriggerOutput("config-export", []string{appName, "false", "true", "json"}...)
+	results, err := common.CallPlugnTrigger(common.PlugnTriggerInput{
+		Trigger: "config-export",
+		Args:    []string{appName, "false", "true", "json"},
+	})
 	if err != nil {
 		return "", err
 	}
 	var env map[string]string
-	if err := json.Unmarshal(b, &env); err != nil {
+	if err := json.Unmarshal(results.StdoutBytes(), &env); err != nil {
 		return "", err
 	}
 
@@ -420,7 +442,11 @@ func createdContainerID(appName string, dockerArgs []string, image string, comma
 	}
 
 	containerID := result.StdoutContents()
-	err = common.PlugnTrigger("post-container-create", []string{"app", containerID, appName, phase}...)
+	_, err = common.CallPlugnTrigger(common.PlugnTriggerInput{
+		Trigger:     "post-container-create",
+		Args:        []string{"app", containerID, appName, phase},
+		StreamStdio: true,
+	})
 	return containerID, err
 }
 
@@ -440,12 +466,27 @@ func setScale(appName string, image string) error {
 	}
 
 	if len(args) == 3 {
-		return common.PlugnTrigger("ps-can-scale", []string{appName, "true"}...)
+		_, err := common.CallPlugnTrigger(common.PlugnTriggerInput{
+			Trigger:     "ps-can-scale",
+			Args:        []string{appName, "true"},
+			StreamStdio: true,
+		})
+		return err
 	}
 
-	if err := common.PlugnTrigger("ps-can-scale", []string{appName, "false"}...); err != nil {
+	_, err = common.CallPlugnTrigger(common.PlugnTriggerInput{
+		Trigger:     "ps-can-scale",
+		Args:        []string{appName, "false"},
+		StreamStdio: true,
+	})
+	if err != nil {
 		return err
 	}
 
-	return common.PlugnTrigger("ps-set-scale", args...)
+	_, err = common.CallPlugnTrigger(common.PlugnTriggerInput{
+		Trigger:     "ps-set-scale",
+		Args:        args,
+		StreamStdio: true,
+	})
+	return err
 }
diff --git a/plugins/app-json/go.mod b/plugins/app-json/go.mod
@@ -12,8 +12,6 @@ require (
 
 require (
 	github.com/alexellis/go-execute/v2 v2.2.1 // indirect
-	github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 // indirect
-	github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect
 	github.com/fatih/color v1.16.0 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect

diff --git a/plugins/app-json/go.sum b/plugins/app-json/go.sum
@@ -1,9 +1,5 @@
 github.com/alexellis/go-execute/v2 v2.2.1 h1:4Ye3jiCKQarstODOEmqDSRCqxMHLkC92Bhse743RdOI=
 github.com/alexellis/go-execute/v2 v2.2.1/go.mod h1:FMdRnUTiFAmYXcv23txrp3VYZfLo24nMpiIneWgKHTQ=
-github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 h1:sDMmm+q/3+BukdIpxwO365v/Rbspp2Nt5XntgQRXq8Q=
-github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM=
-github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 h1:HHUr4P/aKh4quafGxDT9LDasjGdlGkzLbfmmrlng3kA=
-github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27/go.mod h1:VQx0hjo2oUeQkQUET7wRwradO6f+fN5jzXgB/zROxxE=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=