Commit Graph
138 Commits
Author SHA1 Message Date
Jose Diaz-Gonzalez 3423779f0f fix: validate nginx templates as the running nginx user
The wrapper config used to run `nginx -t` against an app's rendered `nginx.conf` declared no `user` directive, so nginx fell back to its compile-time default and chowned every `proxy_cache_path` directory to that user, including directories that already existed. On Debian and Ubuntu that default is `nobody`, so deploying an app shipping a custom `nginx.conf.sigil` took the running server's live cache directory away for the length of the build and turned every request the cache would serve into an HTTP 500, healing only once the deploy's own reload restored the ownership. The wrapper now declares the same `user` as the host's main nginx config, which is also exposed to custom `validate-config` templates as `$.NGINX_USER`.
2026-09-19 10:06:35 -04:00
Jose Diaz-Gonzalez db45f8608b feat: add --clear and --replace flags to ps:scale
The `ps:scale` command merges the specified process types into the existing formation, so replacing an entire formation from the CLI required reading the current scale, diffing it, and issuing a second call to zero out each unlisted process type. The `--replace` flag treats the specified process types as the whole formation and sets the process count for every unspecified process type to zero, while the `--clear` flag resets the formation to the scale a newly created app has. The two flags cannot be combined, `--replace` requires at least one process type, and `--clear` accepts none. Process types cleared this way are now scaled down as part of the same command rather than being left running with a stale formation.
2026-09-02 14:55:16 -04:00
Jose Diaz-Gonzalez e50bcd4a3b fix: stop go-test-plugin from mutating plugin go.mod
The target ran `go get github.com/onsi/gomega` inside the plugin module before every test run, which rewrote that plugin's `go.mod` and `go.sum` as a side effect of running tests. For a plugin that does not use gomega it added the module plus five transitive dependencies as unused indirect requirements, and for one that pins it the `go get` silently upgraded the pinned version, leaving the working tree dirty and fighting the dependency updates. The plugins whose tests use gomega already require it directly, and the test run passes `-mod=readonly`, so nothing needs to be fetched ahead of time.
2026-09-02 04:09:20 -04:00
Jose Diaz-Gonzalez 96d726c43c fix: retire cron containers past their active deadline
Cron containers were never reaped once they exceeded their active deadline, so a hung cron task ran indefinitely instead of being retired after 24 hours as documented. `cron:run` now also accepts a `--ttl-seconds` argument, matching the one `dokku run` already takes.
2026-08-12 13:11:34 -04:00
Jose Diaz-Gonzalez 81a929d768 fix: report traefik dns-provider env vars as global keys
The dynamic `dns-provider-*` properties were reported as `--traefik-dns-provider-<env_var>`, outside the `global`/`computed` namespace every other traefik property uses, so a consumer reading the json report could not tell which of the two a key represented. They are now reported as `--traefik-global-dns-provider-<env_var>`. The `basic-auth-password` property is a credential as well and is now masked in the default report output on the same terms as the dns provider values, meaning the raw value is returned only for `--format json` or when the flag is queried by name.
2026-08-12 03:22:04 -04:00
Jose Diaz-Gonzalez 87b240054f feat: add storage directory mode and removal flags
`storage:create` and `storage:set` accept a `--mode` flag that sets the octal permissions of a docker-local host directory, and `storage:destroy` accepts a `--destroy-host-dir` flag that removes the directory along with its contents. A docker-local entry also honors `--reclaim-policy Delete` at destroy time now, matching how that policy governs a k3s PersistentVolume. Both are limited to the default `/var/lib/dokku/data/storage/<name>` location, the same restriction `--chown` already carries. `storage:set` applies `--chown` and `--mode` to the directory rather than only recording them.
2026-08-10 01:23:10 -04:00
Jose Diaz-Gonzalez 5b5d3d761b fix: apply app-label-alias to shipped events
The alias was only ever used to build the `include_labels` filter on the generated vector source, while dokku labels containers with `com.dokku.app-name` unconditionally. Setting the property therefore pointed the source at a label no container carries, and log collection stopped without any error. The source now always filters the label dokku applies, and a generated remap renames the field on its way to the sink, which is what the property was documented to do. An app whose own alias differs from the global one gets a branch in the global pipeline, so a per-app value is honored even when the app ships through the global sink.

Closes #8916.
2026-08-09 14:01:43 -04:00
Jose Diaz-Gonzalez d134e75371 feat: support manually managed cert issuers on k3s
The `cert-issuer-name` and `cert-issuer-kind` properties point an app's generated `Certificate` at a cert-manager issuer created outside of Dokku, allowing certificates to be issued through solvers the built-in letsencrypt integration cannot use, such as `dns01` for wildcard certificates. Setting an issuer enables https on its own, as a manually managed issuer has no email for Dokku to configure. An imported certificate still takes precedence, and `letsencrypt-server false` remains the single off switch. Dokku warns before a build starts when the referenced issuer is absent from the cluster, without blocking the deploy. Wildcard domains no longer collide with their apex domain when generating ingress names, and `letsencrypt-server` values are now validated when set rather than at deploy time.
2026-08-08 15:16:12 -04:00
Jose Diaz-Gonzalez 8d4e7d9793 fix: match docker options by shell word when removing
Options drained out of the pre-0.38.0 `DOCKER_OPTIONS_<PHASE>` files were copied verbatim rather than re-serialized the way `docker-options:add` stores them, so `docker-options:remove` compared the canonical string it builds against a stored value that could never match it and exited successfully without removing anything. Removal now matches stored options by shell word, and stored options are rewritten into the canonical form once on upgrade, which additionally splits an entry that carried several flags on a single line into one entry per flag so a single flag can be removed and so the readers that match on a flag prefix see one value per entry. The leftover `.migrated` sentinel drain is restored to running ahead of the global short-circuit that had made it unreachable, and the plugin's Go tests are added to the test target that had never run them.
2026-08-07 13:35:37 -04:00
Jose Diaz-Gonzalez 5496029e07 fix: parse cert CN and subject on OpenSSL 3.x
The `certs` plugin extracted a certificate's Common Name and formatted its subject using string assumptions that only held for pre-3.x OpenSSL output, so a certificate with only a Common Name and no Subject Alternative Name reported no hostnames from `certs:report` and was not recognized during nginx config generation, while the subject report retained the `subject=` prefix and used the wrong separators. Normalizing the subject with `-nameopt` before parsing makes the extraction version independent across OpenSSL and LibreSSL.
2026-07-10 15:05:27 -04:00
immanuwell cdb6c1c62e fix: use SYSTEM for shfmt Darwin detection 2026-05-25 12:51:23 +04:00
Jose Diaz-Gonzalez d24ab6ffdf fix: set DOKKU_LIB_ROOT in Go coverage test environment 2026-04-27 01:06:32 -04:00
Jose Diaz-Gonzalez b0b11bcf26 fix: remove buildpacks from dockerfile test app and add tests for app.json buildpacks
The buildpacks entry in tests/apps/dockerfile/app.json caused
the post-extract trigger to write a .buildpacks file during
Dockerfile-based deploys, breaking builder detection. Remove
the entry and add Go unit tests for getBuildpacks/validBuildpackURL,
a bats integration test for deploying with app.json buildpacks,
and documentation for the new feature.
2026-04-18 05:43:44 -04:00
Jose Diaz-Gonzalez 7033a90659 fix: drop check 2026-01-04 23:52:27 -05:00
Jose Diaz-Gonzalez 3f492f2f25 fix: install logrotate in the container 2026-01-03 22:50:38 -05:00
Jose Diaz-Gonzalez f20a6a2563 tests: run unit tests outside of docker by default
This allows execution of unit tests within the devcontainer environment, which already has the correct golang.
2024-12-03 21:45:41 -05:00
Jose Diaz-Gonzalez c25071f0b8 fix: ensure testing still works in docker container environments 2024-09-23 00:33:49 -04:00
Jose Diaz-Gonzalez b996114209 chore: remove debugging 2024-09-23 00:00:56 -04:00
Jose Diaz-Gonzalez 4c634b6fd0 debug: why ssh isnt running 2024-09-22 23:38:28 -04:00
Jose Diaz-Gonzalez 8f18c3d581 debug: update logging 2024-09-22 23:27:33 -04:00
Jose Diaz-Gonzalez 47c1b3b295 fix: restart ssh socket
https://discourse.ubuntu.com/t/sshd-now-uses-socket-based-activation-ubuntu-22-10-and-later/30189
2024-09-22 23:27:33 -04:00
Jose Diaz-Gonzalez 6a22ae05d2 debug: show active systemd services 2024-09-22 23:27:32 -04:00
Jose Diaz-Gonzalez 2c4eb67104 fix: go back to not using systemd 2024-09-22 23:27:32 -04:00
Jose Diaz-Gonzalez 08f68c6634 fix: do not wait forever and use systemctl for interacting with services 2024-09-22 23:27:32 -04:00
Jose Diaz-Gonzalez 5bb4de58d7 fix: update ssh.socket to listen on port 22333
Newer versions of sshd respect the systemd settings for listening on ports vs just the sshd_config.
2024-09-22 23:27:32 -04:00
Jose Diaz-Gonzalez 46c1e80c19 debug: check on ssh status when setting up ci 2024-09-22 23:27:32 -04:00
Jose Diaz-Gonzalez a72cb696f6 debug: show output from ssh attempt 2024-09-22 23:27:32 -04:00
Jose Diaz-Gonzalez d346a347a0 fix: execute go get/build with mod in readonly mode
This will avoid issues where a build or test will inadvertently update dependencies, causing drift between what is in code and what is being tested/run.
2024-03-06 01:52:06 -05:00
Jose Diaz-Gonzalez 28532a56a9 tests: fix issue where CI cannot install docker-buildx-plugin 2024-02-05 14:59:20 -05:00
Jose Diaz-Gonzalez b8329d76ec tests: add support for running golangci-lint automatically
The plugin paths must be computed at execution because not all plugins contain golang code.
2024-01-17 02:28:11 -05:00
Jose Diaz-Gonzalez 17e88da2dc fix: install docker-compose-plugin in ci
This used to be installed as moby-compose in Github Runners but they switched to the docker apt repo and don't install the plugin from the apt repository as it is outdated so we have to do it ourselves.
2023-08-26 14:33:07 -04:00
Jose Diaz-Gonzalez 5846301a48 tests: make it possible to specify an alternative base domain for tests
When developing Dokku, it is useful to use a real domain to test actual functionality. This is impossible if the domain is hardcoded to dokku.me in testing.
2023-08-05 20:58:26 -04:00
Jose Diaz-Gonzalez ef25a9b0d8 refactor: standardize on shorthand for redirecting all output to /dev/null
The shorthand is more prevalent in this codebase, and is something that bash supports, so we should just use the same thing everywhere.

Note that we do not use shorthand redirect in Makefile as shell parsing is a bit different in Make and the shorthand redirect doesn't seem to be properly supported, causing CI errors.
2023-08-05 10:58:57 -04:00
Jose Diaz-Gonzalez dac566e75e refactor: move all shellcheck disable definitions to .shellcheckrc file
This makes standard use of shellcheck work without needing to provide extra configuration anywhere.

Also remove use of inline 'shellcheck disable' calls that are already defined in the .shellcheckrc and don't need to be set inline.
2023-08-05 10:58:57 -04:00
Jose Diaz-Gonzalez 21947837c3 fix: use correct path within the ssl tarballs
Also add a command to help automate the generation of the certificates in the future.
2023-01-16 01:50:52 -05:00
Jose Diaz-Gonzalez edd0b16975 fix: install goverage via go get 2022-11-07 16:11:38 -05:00
Jose Diaz-Gonzalez 4a7edc234a feat: add debugging and use go get to grab godacov 2022-11-02 15:45:33 -04:00
Jose Diaz-Gonzalez 42cd2ae4bc fix: switch to go install from go get
This no longer works as of go 1.18: https://go.dev/doc/go-get-install-deprecation
2022-11-02 11:57:22 -04:00
Jose Diaz-Gonzalez a39a47b3ae feat: respect TARGETARCH when installing development dependencies 2022-10-12 21:53:11 -04:00
Jose Diaz-Gonzalez a7465f9d81 tests: use github actions instead of circleci for test running 2021-01-20 14:00:07 -05:00
Jose Diaz-Gonzalez e4ec973a6e Merge pull request #4329 from dokku/apt-no-install-recommends
Standardize apt-get usage
2021-01-18 12:12:11 -05:00
Jose Diaz-Gonzalez ed84f21c08 refactor: standardize apt-get usage
- Always put flags in same location
- Always use apt-get
- Add --no-install-recommends where possible
2021-01-17 20:19:56 -05:00
Jose Diaz-Gonzalez 1dc63eecbd tests: switch to upstream bats-core
Bats core now has junit report formatting, so there is no need to continue using a fork.
2021-01-17 16:18:24 -05:00
Jose Diaz-Gonzalez f53b26f3f0 tests: update junit test files when a bats retry is successful 2020-12-20 17:26:27 -05:00
Jose Diaz-Gonzalez 465e220315 feat: retry failing and skipped tests once
Plugn is fairly brittle since the upgrade to bash 5, so this might help decrease the need to retry the whole circleci job.
2020-12-20 02:42:37 -05:00
Kazuhiro NISHIYAMA 98c81513aa Accept first pushed branch as deploy-branch
And set to DOKKU_DEPLOY_BRANCH.

Idea from https://github.com/dokku/dokku/pull/4167#issuecomment-717607136
2020-12-08 23:15:11 +09:00
Jose Diaz-Gonzalez 3f4b0eccd8 refactor: call tests while in directories
They fail to be listed in go list after the gomodules move.
2020-06-28 13:59:08 -04:00
Jose Diaz-Gonzalez 9dbc352006 chore: turn on go mod 2020-06-28 01:42:09 -04:00
Jose Diaz-Gonzalez 9d6746001e chore: revert 2020-06-20 00:28:30 -04:00
Jose Diaz-Gonzalez 0b9cecef4d tests: move testing command into config 2020-06-19 23:24:03 -04:00