Commit Graph
14345 Commits
Author SHA1 Message Date
Jose Diaz-Gonzalez c2ebf48524 refactor: use a single implementation for checking cnb/herokuish images
Also use a plugin trigger for testing whether an image is herokuish or not rather than trying to mess around with sourced files.
2022-12-02 15:54:48 -05:00
Jose Diaz-Gonzalez a2cc6b84d6 fix: use assert_output_contains so as not to worry about order 2022-12-02 10:47:40 -05:00
Jose Diaz-Gonzalez 1dda402769 fix: do not depend upon domains:setup in tests
Since it is now called on app creation, it doesn't work as expected for 'resetting' already set state.
2022-12-02 02:33:54 -05:00
Jose Diaz-Gonzalez edd6e476b3 refactor: simplify how url generation works
The URLS file is no longer necessary as urls are now generated directly from the app VHOST file.

This also moves all the url generation logic to the domains plugin.
2022-12-02 02:19:59 -05:00
Jose Diaz-Gonzalez f4f0a29446 fix: correct domain wildcard tests for new domain initialization method 2022-12-01 22:57:31 -05:00
Jose Diaz-Gonzalez d18cb3766c fix: correct tests for new domain initialization method 2022-12-01 22:39:38 -05:00
Jose Diaz-Gonzalez 9eab17af11 refactor: setup app domains in the post-create hook
This is more consistent with app setup, at the cost of making it so developers must disable domains manually afterwards.
2022-12-01 22:39:38 -05:00
Jose Diaz-Gonzalez 1fab98286b fix: also report that there is a network config if a static-web-listener is specified 2022-12-01 22:39:38 -05:00
Jose Diaz-Gonzalez 203a56fa11 chore: remote whitespace 2022-12-01 22:39:20 -05:00
Jose Diaz-Gonzalez 78438dfb74 chore: do not rework network config if the scheduler is not docker-local 2022-12-01 22:39:20 -05:00
Jose Diaz-Gonzalez 348a593ee8 refactor trigger proxy-build-config from nginx#core-post-deploy
This reduces the duplicated code in the plugin.
2022-12-01 22:39:20 -05:00
josegonzalez 9ccd1f397c Merge pull request #5503 from dokku/josegonzalez-patch-1
Document potential deployment downtime
2022-12-01 22:39:00 -05:00
josegonzalez 84a727a3aa Document potential deployment downtime
Closes #5435
2022-12-01 22:38:32 -05:00
josegonzalez 9e8312360e Merge pull request #5500 from dokku/dependabot/maven/tests/apps/java/org.apache.maven.plugins-maven-dependency-plugin-3.4.0
chore(deps): bump maven-dependency-plugin from 3.3.0 to 3.4.0 in /tests/apps/java
2022-12-01 10:53:27 -05:00
dependabot[bot] fed6b871ce chore(deps): bump maven-dependency-plugin in /tests/apps/java
Bumps [maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/apache/maven-dependency-plugin/releases)
- [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.3.0...maven-dependency-plugin-3.4.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-dependency-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-01 07:27:17 +00:00
josegonzalez 9e939ea816 Merge pull request #5472 from dokku/5381-compose-proxy-lifecycle 2022-12-01 02:16:45 -05:00
Jose Diaz-Gonzalez 7ec555f617 fix: properly test priority
It is no longer part of the service name.
2022-12-01 00:27:21 -05:00
Jose Diaz-Gonzalez e2d215ab4f fix: do not run enable/disable when using init.d
init.d doesn't support these two commands, causing nginx:stop/nginx:start to fail.
2022-11-30 15:00:05 -05:00
Jose Diaz-Gonzalez a8bc8044e4 feat: switch to systemctl for interacting with the nginx init process 2022-11-29 01:38:36 -05:00
Jose Diaz-Gonzalez 5fed0c45ac refactor: use the properties system instead of the data dir for tracking whether a proxy should be stopped or started 2022-11-29 01:38:36 -05:00
Jose Diaz-Gonzalez 6fed37b408 refactor: rename pre-restore trigger to scheduler-pre-restore
This better reflects what the trigger does, and allows us to use the pre-restore trigger at the beginning of the ps:restore command.
2022-11-29 01:38:36 -05:00
Jose Diaz-Gonzalez 77fbd676bc feat: start caddy/nginx/traefik prior to restoring applications
This ensures routing works as expected.
2022-11-29 01:38:36 -05:00
Jose Diaz-Gonzalez b97a5c0c00 feat: keep track of whether proxy implementation should be stopped or started 2022-11-29 01:38:36 -05:00
Jose Diaz-Gonzalez bde7b16a80 chore: reorder commands alphabetically 2022-11-29 01:38:36 -05:00
Jose Diaz-Gonzalez 5c205b9e27 feat: keep track of whether caddy and traefik should be stopped/started 2022-11-29 01:38:36 -05:00
Jose Diaz-Gonzalez 2946e6d632 fix: enable/disable nginx when calling nginx:start/nginx:stop 2022-11-29 01:38:36 -05:00
Jose Diaz-Gonzalez 1d85095ec8 feat: allow dokku user to enable/disable nginx service 2022-11-29 01:38:36 -05:00
josegonzalez a42360ec34 Merge pull request #5493 from dokku/5410-fix-ssl-detection
Correct issue with detection of non-https port mapping as https port mapping
2022-11-29 01:38:15 -05:00
josegonzalez 6522012b89 fix: do not use priority in test lookup 2022-11-29 01:27:57 -05:00
Jose Diaz-Gonzalez b7bff8e152 fix: correct issue with detection of non-https port mapping as https port mapping
This allows folks to _only_ set the letsencrypt-email in order to get https working as expected.

Closes #5410
2022-11-29 00:21:04 -05:00
josegonzalez 2f79e68542 Merge pull request #5499 from dokku/traefik-priority-v2
Do not use traefik priority in service name
2022-11-29 00:20:13 -05:00
Jose Diaz-Gonzalez 2807d71ac6 fix: do not use traefik priority in service name
This breaks the ability to add new rules on the fly and also makes routing a bit more difficult.
2022-11-29 00:19:53 -05:00
josegonzalez a416b07b0f Merge pull request #5497 from dokku/dependabot/docker/tests/apps/dockerfile-entrypoint/ruby-3.1.3
chore(deps): bump ruby from 3.1.2 to 3.1.3 in /tests/apps/dockerfile-entrypoint
2022-11-28 11:16:50 -05:00
josegonzalez 6400c84782 Merge pull request #5496 from dokku/dependabot/bundler/tests/apps/ruby/sinatra-3.0.4
chore(deps): bump sinatra from 3.0.3 to 3.0.4 in /tests/apps/ruby
2022-11-28 11:16:41 -05:00
dependabot[bot] c8fc1e5ca8 chore(deps): bump ruby in /tests/apps/dockerfile-entrypoint
Bumps ruby from 3.1.2 to 3.1.3.

---
updated-dependencies:
- dependency-name: ruby
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-28 13:21:45 +00:00
dependabot[bot] 40c41d0a7e chore(deps): bump sinatra from 3.0.3 to 3.0.4 in /tests/apps/ruby
Bumps [sinatra](https://github.com/sinatra/sinatra) from 3.0.3 to 3.0.4.
- [Release notes](https://github.com/sinatra/sinatra/releases)
- [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sinatra/sinatra/compare/v3.0.3...v3.0.4)

---
updated-dependencies:
- dependency-name: sinatra
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-28 13:01:56 +00:00
josegonzalez d8aebda820 Merge pull request #5494 from dokku/silence-install
Silence the warning message when there are no dokku apps on install
2022-11-28 02:21:14 -05:00
Jose Diaz-Gonzalez 1a14731f46 chore: silence the warning message when there are no dokku apps on install 2022-11-28 02:20:54 -05:00
josegonzalez f8cf40fc2d Merge pull request #5490 from dokku/custom-traefik-priority
Add ability to set a custom priority for traefik routing rules
2022-11-27 23:55:27 -05:00
josegonzalez 7c2ff907f4 Merge pull request #5489 from dokku/5432-lock-exit-code
Use exit code 137 to signify a lock was unable to be retrieved when calling ps:retire
2022-11-27 23:13:51 -05:00
josegonzalez ac9c2db306 Merge pull request #5491 from dokku/josegonzalez-patch-1
Add missing http part to traefik routing rule
2022-11-27 22:27:04 -05:00
josegonzalez 1d13239ace fix: add missing http part to traefik routing rule 2022-11-27 22:26:47 -05:00
Jose Diaz-Gonzalez e26b0ba1db feat: add ability to set a custom priority for traefik routing rules 2022-11-27 22:23:06 -05:00
Jose Diaz-Gonzalez bc26766b84 refactor: use exit code 137 to signify a lock was unable to be retrieved when calling ps:retire
Closes #5432
2022-11-27 20:23:13 -05:00
josegonzalez 38cb05e7b1 Merge pull request #5487 from dokku/traefik-priority
Use a priority when routing requests with traefik
2022-11-27 19:35:10 -05:00
Jose Diaz-Gonzalez 56beaf6dd5 feat: use a priority when routing requests with traefik
This ensures we always use the newer config when there are conflicting versions.
2022-11-27 19:34:05 -05:00
josegonzalez c29967eaa5 Merge pull request #5480 from dokku/5112-procfile-cleanup
Cleanup zero'd out processes when a Procfile omitting those process types is set
2022-11-27 16:13:44 -05:00
josegonzalez ff53949ef3 Merge pull request #5484 from IgnisDa/master
Add edgedb community plugin
2022-11-27 15:53:05 -05:00
Jose Diaz-Gonzalez 22f6db1c6a chore: drop nginx config if there is no network config for the app 2022-11-27 15:07:42 -05:00
Jose Diaz-Gonzalez e458c8e4a6 fix: keep track of old scale values for a single deploy
This will ensure we scale things down after usage.
2022-11-27 15:02:45 -05:00