Commit Graph

5983 Commits

Author SHA1 Message Date
Nate
75bb83bdec The default branch for ruby-getting-started is 'main', not 'master
- Ensure the user is using the master branch to match later instructions to do a git push master.
2020-10-27 17:11:28 -06:00
Jose Diaz-Gonzalez
57b317b0a4 Merge pull request #4144 from dokku/dependabot/composer/tests/apps/php/heroku/heroku-buildpack-php-181 2020-10-10 20:44:47 -04:00
dependabot-preview[bot]
d5cc136df2 chore(deps-dev): bump heroku/heroku-buildpack-php in /tests/apps/php
Bumps [heroku/heroku-buildpack-php](https://github.com/heroku/heroku-buildpack-php) from 180 to 181.
- [Release notes](https://github.com/heroku/heroku-buildpack-php/releases)
- [Changelog](https://github.com/heroku/heroku-buildpack-php/blob/main/CHANGELOG.md)
- [Commits](https://github.com/heroku/heroku-buildpack-php/compare/v180...v181)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-02 04:50:32 +00:00
Jose Diaz-Gonzalez
0731616ebf Merge pull request #4135 from znz/fix-broken-table
Fix broken table
2020-09-23 00:47:02 -04:00
Jose Diaz-Gonzalez
6957a33ec7 Merge pull request #4137 from dokku/dependabot/composer/tests/apps/php/heroku/heroku-buildpack-php-180
chore(deps-dev): bump heroku/heroku-buildpack-php from 179 to 180 in /tests/apps/php
2020-09-23 00:46:47 -04:00
Jose Diaz-Gonzalez
46c274dcf2 Merge pull request #4140 from swrobel/patch-2
Note Ubuntu 20.04 support in README
2020-09-23 00:46:10 -04:00
Stefan Wrobel
ae21056401 Note Ubuntu 20.04 support in README 2020-09-21 17:57:32 -07:00
dependabot-preview[bot]
87574f7d76 chore(deps-dev): bump heroku/heroku-buildpack-php in /tests/apps/php
Bumps [heroku/heroku-buildpack-php](https://github.com/heroku/heroku-buildpack-php) from 179 to 180.
- [Release notes](https://github.com/heroku/heroku-buildpack-php/releases)
- [Changelog](https://github.com/heroku/heroku-buildpack-php/blob/main/CHANGELOG.md)
- [Commits](https://github.com/heroku/heroku-buildpack-php/compare/v179...v180)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-16 00:54:01 +00:00
Jose Diaz-Gonzalez
30d8ebffb9 Merge pull request #4136 from hugopeixoto/docs/ruby-getting-started-uses-main-instead-of-master
Use git push main:master in docs
2020-09-14 16:23:00 -04:00
Hugo Peixoto
71876756a4 Use git push main:master in docs
Heroku's ruby project changed its default branch from master to main.
This broke the examples in the documentation. This change explicitly
names main and master.
2020-09-14 20:23:35 +01:00
Kazuhiro NISHIYAMA
b1b85b4106 Fix broken table
[ci skip]
2020-09-13 12:46:46 +09:00
Jose Diaz-Gonzalez
196b5d08eb Merge pull request #4130 from dokku/3932-clear-proxy-on-boot
Clear proxy configs on boot
2020-09-10 12:24:27 -04:00
Jose Diaz-Gonzalez
2026a2731d Merge pull request #4131 from dokku/4088-bump-docker
Bump minimum docker version
2020-09-10 10:56:21 -04:00
Jose Diaz-Gonzalez
c8d932f768 fix: bump minimum docker version
This is necessary in order to properly support image filtering during 'dokku cleanup' calls.

Closes #4088
2020-09-10 02:00:57 -04:00
Jose Diaz-Gonzalez
752a0cacd9 fix: clear proxy configs on boot
Unfortunately, Docker does not persist container IPs on boot, so containers may come up with the wrong IP, resulting in proxying to the incorrect app after a server restart. Instead, we should delete the configs and let ps:restore rebuild the proxy config correctly.

Closes #3932
2020-09-10 01:58:45 -04:00
Jose Diaz-Gonzalez
ecc6c9e01d Merge pull request #4129 from dokku/4102-prohibit-non-dns-names
Prohibit non-dns names for apps and process types
2020-09-09 23:39:27 -04:00
Jose Diaz-Gonzalez
7e9f98b513 Merge pull request #4080 from hugopeixoto/fix/app-vhost-usage 2020-09-09 21:23:15 -04:00
Jose Diaz-Gonzalez
0f514f300e feat: prohibit non-dns names for apps and process types
This is necessary for ensuring ssl certificates can be auto-retrieved for apps, and also easing integration into schedulers that use names and process types as part of DNS records.

As well, this fixes an issue where we may potentially have invalid DNS entries when adding apps to custom networks.

Closes #4102
Closes #4114
2020-09-09 20:07:50 -04:00
Jose Diaz-Gonzalez
017cfef6a2 Merge pull request #4125 from dokku/4086-custom-nginx-app-conf-location
Allow customizing the various nginx templates
2020-09-09 19:51:33 -04:00
Jose Diaz-Gonzalez
becf7c1f86 feat: allow customizing the various nginx templates
This will let custom distributions of Dokku to override the internal templates without needing to repackage Dokku or overwrite core files.
2020-09-06 13:57:35 -04:00
Jose Diaz-Gonzalez
9e6c89428e Merge pull request #4124 from dokku/4101-docker-options-docs 2020-09-06 13:21:30 -04:00
Jose Diaz-Gonzalez
8d96be73b7 docs: note that docker options require app rebuilds
Closes #4101
2020-09-06 13:20:34 -04:00
Jose Diaz-Gonzalez
21c8639397 docs: drop advanced usage
Dokku internals shouldn't be exposed in docs. Additionally, the internals here are likely to change in the future as this moves to the upcoming prop binary, so having incorrect docs will hinder that move.
2020-09-06 13:18:34 -04:00
Jose Diaz-Gonzalez
1699c6f3a3 Merge pull request #4118 from dokku/dependabot/pip/tests/apps/dockerfile-release/django-3.0.7
chore(deps): bump django from 3.0.2 to 3.0.7 in /tests/apps/dockerfile-release
2020-09-06 12:56:59 -04:00
Jose Diaz-Gonzalez
70c947289f Merge pull request #4121 from dokku/4087-nginx-extract-disable
Add ability to disable custom ninx.conf.sigil extraction
2020-09-05 11:48:57 -04:00
Jose Diaz-Gonzalez
a4e54b6d00 Merge pull request #4123 from fomojola/patch-1
Support for expected CHECKS text with special characters
2020-09-04 19:12:16 -04:00
fomojola
ab9780d971 Support for expected text with special characters
Added a quote around the "$EXPECTED" to deal with text with restricted characters. While deploying a Spring Boot application, the content of the built-in health check is {"status":"UP"}. Unfortunately all my checks failed, because for some reason the comparison didn't like this content.

remote:  !     http://localhost/actuator/health: expected to but did not find: "{"status":"UP"}"
remote:  !     Check attempt 7/10 failed.

After making this change, it works: I'm assuming the difference is that the presence of the quote characters in the content.
2020-09-04 16:49:47 -04:00
Jose Diaz-Gonzalez
f5ba843cf3 feat: add ability to disable custom ninx.conf.sigil extraction
Closes #4087
2020-09-04 11:29:23 -04:00
Jose Diaz-Gonzalez
052f2a5868 Merge pull request #4115 from dokku/4099-image-cleanup
Add missing labels to built images
2020-08-31 21:25:55 -04:00
dependabot[bot]
893df14c3e chore(deps): bump django in /tests/apps/dockerfile-release
Bumps [django](https://github.com/django/django) from 3.0.2 to 3.0.7.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.0.2...3.0.7)

Signed-off-by: dependabot[bot] <support@github.com>
2020-09-01 01:23:13 +00:00
Jose Diaz-Gonzalez
43c521c193 Merge pull request #4117 from dokku/go-app-json 2020-08-31 21:22:21 -04:00
Jose Diaz-Gonzalez
2a1d3877f1 fix: add docblock 2020-08-31 21:03:16 -04:00
Jose Diaz-Gonzalez
4d735b4d88 fix: do not output error on checking for process type existence 2020-08-31 18:55:39 -04:00
Jose Diaz-Gonzalez
b8b6d64f75 fix: correct stickler-ci errors and remove unused code 2020-08-31 18:44:00 -04:00
Jose Diaz-Gonzalez
2b65def123 fix: pass command directly to entrypoint
Closes #3706
2020-08-31 18:36:07 -04:00
Jose Diaz-Gonzalez
7fe69fa269 fix: add missing hook 2020-08-31 18:26:36 -04:00
Jose Diaz-Gonzalez
84367e1c16 fix: correctly handle injecting environment variables to deployment tasks
Also test that release tasks are invoked the correct environment.

Closes #3817
2020-08-31 15:01:14 -04:00
Jose Diaz-Gonzalez
0faf305f28 Merge pull request #4116 from Schlepptop/config-clear-fix 2020-08-31 14:04:27 -04:00
Michael Chen
e64f7b34ff Add unit test for config:clear 2020-08-31 18:48:36 +02:00
Michael Chen
5ea4c9a73d 🐛 Whitelist config:clear command in Makefile 2020-08-31 18:28:59 +02:00
Jose Diaz-Gonzalez
7e7931f1ce fix: add run prefix to deploy_app calls 2020-08-31 04:52:44 -04:00
Jose Diaz-Gonzalez
428beb3413 fix: pass in correct image variable 2020-08-31 04:23:10 -04:00
Jose Diaz-Gonzalez
9aab7dce7d feat: create ps directory on app create 2020-08-31 04:22:40 -04:00
Jose Diaz-Gonzalez
2478556df1 fix: ensure the base directory exists before extracting the file 2020-08-31 04:22:27 -04:00
Jose Diaz-Gonzalez
a2d4ba4689 fix: set correct args for fn-procfile-extract 2020-08-31 04:21:59 -04:00
Jose Diaz-Gonzalez
4ab9632526 fix: handle case where there is no app.json
Somehow, an empty file may get copied over...
2020-08-31 02:56:50 -04:00
Jose Diaz-Gonzalez
baa819c2a5 fix: add missing labels to built images
This fixes an issue where disk space is not recouped after deploys unless 'dokku cleanup' without arguments is called.

Also injects the label-schema labels as necessary.

Refs #4099
2020-08-31 02:37:04 -04:00
Jose Diaz-Gonzalez
aaf8bc811a chore: drop now unused internal-functions file 2020-08-31 02:33:07 -04:00
Jose Diaz-Gonzalez
53dabf7fd0 refactor: fix handling of string andd array CMD and ENTRYPOINT values
Previous versions extracted the values as strings, prefixing the values with `/bin/sh -c '$CMD'` unnecessarily. This caused issues where we would incorrectly overrride these values when an app had a predeploy script.

Closes #3143
2020-08-31 02:31:36 -04:00
Jose Diaz-Gonzalez
7ca4cba8ec chore: drop extra quotes 2020-08-31 02:06:24 -04:00