Mirrors/dokku
1
0
Fork 0
mirror of https://github.com/dokku/dokku.git synced 2025-12-29 00:25:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,969 Commits 6 Branches 319 Tags
c8d932f76876a1d5d3dee75c9acecfff60951cfb
Commit Graph

5969 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Jose Diaz-Gonzalez
5965b70b39 fix: do not log empty messages 2020-08-31 02:05:21 -04:00
Jose Diaz-Gonzalez
23db07ed4e chore: remove extra LogDebug call 2020-08-31 02:05:03 -04:00
Jose Diaz-Gonzalez
53e75e7898 chore: rewrite log message 
This change makes it more clear as to what is being executed.
 2020-08-31 02:04:51 -04:00
Jose Diaz-Gonzalez
16d15ae9bf Merge pull request #4113 from dokku/remove-herokuish-release 
Drop herokuish release code
 2020-08-30 17:01:40 -04:00
Jose Diaz-Gonzalez
3def0ae036 Merge pull request #4103 from dokku/dependabot/composer/tests/apps/php/heroku/heroku-buildpack-php-179 
chore(deps-dev): bump heroku/heroku-buildpack-php from 178 to 179 in /tests/apps/php
 2020-08-30 17:01:29 -04:00
Jose Diaz-Gonzalez
31ab2f97f6 fix: split arguments to ensure they get parsed properly 2020-08-30 16:05:10 -04:00
Jose Diaz-Gonzalez
8126c63d6e fix: properly handle return from PluginTriggerOutput 2020-08-30 14:51:25 -04:00
Jose Diaz-Gonzalez
beb42b53b2 tests: ensure the deploy succeeeds 2020-08-30 14:51:02 -04:00
Jose Diaz-Gonzalez
6df38a56d1 fix: properly set property... 2020-08-30 14:22:55 -04:00
Jose Diaz-Gonzalez
68debb44f7 refactor: use plugin trigger to delete procfile 2020-08-30 14:22:47 -04:00
Jose Diaz-Gonzalez
f27096f235 refactor: implement appjson in golang 2020-08-30 13:41:15 -04:00
Jose Diaz-Gonzalez
f2a623fde0 fix: trim whitespace to ensure container ID is valid 2020-08-30 13:41:15 -04:00
Jose Diaz-Gonzalez
7ee26d41f7 fix: correct doc 2020-08-30 13:41:15 -04:00
Jose Diaz-Gonzalez
55c77773ab fix: read input correct as string 2020-08-30 13:41:15 -04:00