Compare commits

...

25 Commits

Author SHA1 Message Date
Dokku Bot
c45b61d402 Release 0.26.6
# History

## 0.26.6

Install/update via the bootstrap script:

```shell
wget https://raw.githubusercontent.com/dokku/dokku/v0.26.6/bootstrap.sh
sudo DOKKU_TAG=v0.26.6 bash bootstrap.sh
```

### Bug Fixes

- #4919: @nerg4l fix: do not validate global flag as an app name
- #4918: @josegonzalez Use netrc binary to properly release dokku client homebrew formula
2021-11-12 15:09:05 +00:00
Jose Diaz-Gonzalez
f1b0be30e0 Merge pull request #4919 from nerg4l/fix-network-global
fix: do not validate global flag as an app name
2021-11-12 10:08:26 -05:00
László Görög
1222b9fdb4 fix: do not validate global flag as an app name 2021-11-12 10:37:15 +01:00
Jose Diaz-Gonzalez
bb54231233 Merge pull request #4918 from dokku/formula-release-with-creds
Use netrc binary to properly release dokku client homebrew formula
2021-11-11 19:29:58 -05:00
Jose Diaz-Gonzalez
4306178966 fix: use netrc binary to properly release dokku client homebrew formula 2021-11-11 18:59:03 -05:00
Dokku Bot
dde29c5d77 Release 0.26.5
# History

## 0.26.5

Install/update via the bootstrap script:

```shell
wget https://raw.githubusercontent.com/dokku/dokku/v0.26.5/bootstrap.sh
sudo DOKKU_TAG=v0.26.5 bash bootstrap.sh
```

### Bug Fixes

- #4917: @josegonzalez Update golang to fix golang tests
- #4915: @josegonzalez Add support for --global flag to network:set command

### Documentation

- #4911: @josegonzalez Add initial dokku-pro documentation
- #4910: @josegonzalez Fix typo on persistent storage docs

### Tests

- #4916: @josegonzalez Ignore new SC2295 shellcheck warning
- #4906: @josegonzalez Upgrade ci linters

### Other

- #4914: @dependabot[bot] chore(deps): bump jinja2 from 3.0.2 to 3.0.3 in /tests/apps/python-flask
2021-11-11 23:46:03 +00:00
Jose Diaz-Gonzalez
4cd9feae7b Merge pull request #4917 from dokku/upgrade-golang
Update golang to fix golang tests
2021-11-11 18:04:04 -05:00
Jose Diaz-Gonzalez
9a403aa1ce fix: update golang to fix golang tests
Also ensure we're running the same version of golang in our test apps.
2021-11-11 16:51:48 -05:00
Jose Diaz-Gonzalez
daf574188a Merge pull request #4916 from dokku/josegonzalez-patch-1
Ignore new SC2295 shellcheck warning
2021-11-11 16:49:17 -05:00
Jose Diaz-Gonzalez
5cf3dfa451 Merge pull request #4915 from dokku/add-missing-global-network-flag
Add support for --global flag to network:set command
2021-11-11 16:44:08 -05:00
Jose Diaz-Gonzalez
c607af658e Update lint.yml 2021-11-11 16:05:31 -05:00
Jose Diaz-Gonzalez
58f96a6068 fix: ignore new SC2295 error 2021-11-11 15:38:57 -05:00
Jose Diaz-Gonzalez
1a1673095e Merge pull request #4914 from dokku/dependabot/pip/tests/apps/python-flask/jinja2-3.0.3
chore(deps): bump jinja2 from 3.0.2 to 3.0.3 in /tests/apps/python-flask
2021-11-11 15:37:58 -05:00
Jose Diaz-Gonzalez
509cd3e95f fix: add support for --global flag to network:set command 2021-11-11 15:35:51 -05:00
dependabot[bot]
0347748c50 chore(deps): bump jinja2 from 3.0.2 to 3.0.3 in /tests/apps/python-flask
Bumps [jinja2](https://github.com/pallets/jinja) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst)
- [Commits](https://github.com/pallets/jinja/compare/3.0.2...3.0.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-10 13:09:17 +00:00
Jose Diaz-Gonzalez
6fab646a61 docs: update dokku pro purchase link 2021-11-09 14:50:29 -05:00
Jose Diaz-Gonzalez
5a9405a315 docs: add script tag for dokku pro 2021-11-09 12:51:44 -05:00
Jose Diaz-Gonzalez
24c7adb346 chore: drop script tag as github strips it 2021-11-09 12:50:46 -05:00
Jose Diaz-Gonzalez
bad9649200 docs: fix script tag 2021-11-09 11:07:44 -05:00
Jose Diaz-Gonzalez
12e5cbb297 Merge pull request #4911 from dokku/dokku-pro
Add initial dokku-pro documentation
2021-11-09 11:06:24 -05:00
Jose Diaz-Gonzalez
5d54866e52 docs: add initial dokku-pro documentation 2021-11-09 11:04:34 -05:00
Jose Diaz-Gonzalez
f39d8d93ab Merge pull request #4910 from dokku/4909-typo
Fix typo on persistent storage docs
2021-11-08 10:17:50 -05:00
Jose Diaz-Gonzalez
f8b1b02df5 docs: fix typo on persistent storage docs
Closes #4909
2021-11-08 10:17:29 -05:00
Jose Diaz-Gonzalez
74ba52b883 Merge pull request #4906 from dokku/update-linters
Upgrade ci linters
2021-11-05 12:13:16 -04:00
Jose Diaz-Gonzalez
5d4a65a3cb feat: upgrade linters 2021-11-05 01:24:50 -04:00
77 changed files with 254 additions and 159 deletions

View File

@@ -18,8 +18,8 @@ jobs:
- name: Clone - name: Clone
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Run hadolint - name: Run hadolint
uses: brpaz/hadolint-action@1623ba61710b974b55ba455930e6f2c8ef919778 uses: hadolint/hadolint-action@d7b38582334d9ac11c12021c16f21d63015fa250
# v1.3.1 => 1623ba61710b974b55ba455930e6f2c8ef919778 # v1.6.0 => d7b38582334d9ac11c12021c16f21d63015fa250
markdown-lint: markdown-lint:
name: markdown-lint name: markdown-lint
@@ -41,11 +41,11 @@ jobs:
- name: Clone - name: Clone
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Run shellcheck - name: Run shellcheck
uses: ludeeus/action-shellcheck@d586102c117f97e63d7e3b56629d269efc9a7c60 uses: ludeeus/action-shellcheck@94e0aab03ca135d11a35e5bfc14e6746dc56e7e9
# 1.0.0 => d586102c117f97e63d7e3b56629d269efc9a7c60 # 1.1.0 => 94e0aab03ca135d11a35e5bfc14e6746dc56e7e9
env: env:
# keep in sync with tests/shellcheck-exclude # keep in sync with tests/shellcheck-exclude
SHELLCHECK_OPTS: -e SC1001 -e SC1003 -e SC1090 -e SC1091 -e SC1117 -e SC2029 -e SC2030 -e SC2031 -e SC2034 -e SC2046 -e SC2064 -e SC2068 -e SC2086 -e SC2119 -e SC2120 -e SC2128 -e SC2148 -e SC2153 -e SC2154 -e SC2155 -e SC2162 -e SC2174 -e SC2179 -e SC2191 -e SC2199 -e SC2207 -e SC2219 -e SC2220 -e SC2230 -e SC2231 -e SC2235 -e SC2267 SHELLCHECK_OPTS: -e SC1001 -e SC1003 -e SC1090 -e SC1091 -e SC1117 -e SC2029 -e SC2030 -e SC2031 -e SC2034 -e SC2046 -e SC2064 -e SC2068 -e SC2086 -e SC2119 -e SC2120 -e SC2128 -e SC2148 -e SC2153 -e SC2154 -e SC2155 -e SC2162 -e SC2174 -e SC2179 -e SC2191 -e SC2199 -e SC2207 -e SC2219 -e SC2220 -e SC2230 -e SC2231 -e SC2235 -e SC2267 -e SC2295
shfmt: shfmt:
name: shfmt name: shfmt
@@ -54,8 +54,8 @@ jobs:
- name: Clone - name: Clone
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Run shfmt - name: Run shfmt
uses: luizm/action-sh-checker@442951059cb22d260c6e69309ae59cb7bb2334b8 uses: luizm/action-sh-checker@7f44869033b40ee4ffe7dc76c87a1bc66e3d025a
# v0.1.12 => 442951059cb22d260c6e69309ae59cb7bb2334b8 # v0.3.0 => 7f44869033b40ee4ffe7dc76c87a1bc66e3d025a
env: env:
SHFMT_OPTS: -l -bn -ci -i 2 -d SHFMT_OPTS: -l -bn -ci -i 2 -d
with: with:
@@ -68,7 +68,7 @@ jobs:
- name: Clone - name: Clone
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Run yamllint - name: Run yamllint
uses: ibiqlik/action-yamllint@b2aeacc1b7eeb8c23e84bba320d04fb5d6a323ee uses: ibiqlik/action-yamllint@ed2b6e911569708ed121c14b87d513860a7e36a7
# v3.0.0 => b2aeacc1b7eeb8c23e84bba320d04fb5d6a323ee # v3.0.4 => ed2b6e911569708ed121c14b87d513860a7e36a7
with: with:
config_file: '.github/linters/.yamllint.yml' config_file: '.github/linters/.yamllint.yml'

View File

@@ -83,6 +83,8 @@ jobs:
run: | run: |
git config --global user.name 'Dokku Bot' git config --global user.name 'Dokku Bot'
git config --global user.email no-reply@dokku.com git config --global user.email no-reply@dokku.com
# brew tap dokku/repo "https://$HOMEBREW_GITHUB_USERNAME:$HOMEBREW_GITHUB_API_TOKEN@github.com/dokku/homebrew-repo.git" curl -sSL https://github.com/dokku/netrc/releases/download/v0.4.1/netrc_0.4.1_darwin_x86_64.tgz | tar xvf -
mv netrc /usr/local/bin/netrc
netrc set github.com "$HOMEBREW_GITHUB_USERNAME" "$HOMEBREW_GITHUB_API_TOKEN"
brew tap dokku/repo brew tap dokku/repo
brew bump-formula-pr -f --no-browse --no-audit --no-fork --debug --verbose --url "https://github.com/dokku/dokku/archive/${{ needs.release.outputs.version }}.tar.gz" dokku/repo/dokku brew bump-formula-pr -f --no-browse --no-audit --no-fork --debug --verbose --url "https://github.com/dokku/dokku/archive/${{ needs.release.outputs.version }}.tar.gz" dokku/repo/dokku

View File

@@ -1,5 +1,47 @@
# History # History
## 0.26.6
Install/update via the bootstrap script:
```shell
wget https://raw.githubusercontent.com/dokku/dokku/v0.26.6/bootstrap.sh
sudo DOKKU_TAG=v0.26.6 bash bootstrap.sh
```
### Bug Fixes
- #4919: @nerg4l fix: do not validate global flag as an app name
- #4918: @josegonzalez Use netrc binary to properly release dokku client homebrew formula
## 0.26.5
Install/update via the bootstrap script:
```shell
wget https://raw.githubusercontent.com/dokku/dokku/v0.26.5/bootstrap.sh
sudo DOKKU_TAG=v0.26.5 bash bootstrap.sh
```
### Bug Fixes
- #4917: @josegonzalez Update golang to fix golang tests
- #4915: @josegonzalez Add support for --global flag to network:set command
### Documentation
- #4911: @josegonzalez Add initial dokku-pro documentation
- #4910: @josegonzalez Fix typo on persistent storage docs
### Tests
- #4916: @josegonzalez Ignore new SC2295 shellcheck warning
- #4906: @josegonzalez Upgrade ci linters
### Other
- #4914: @dependabot[bot] chore(deps): bump jinja2 from 3.0.2 to 3.0.3 in /tests/apps/python-flask
## 0.26.4 ## 0.26.4
Install/update via the bootstrap script: Install/update via the bootstrap script:

View File

@@ -98,8 +98,8 @@ Otherwise, you will need to import the keypair manually after installation using
To install the latest stable release, run the following commands as a user who has access to `sudo`: To install the latest stable release, run the following commands as a user who has access to `sudo`:
```shell ```shell
wget https://raw.githubusercontent.com/dokku/dokku/v0.26.4/bootstrap.sh wget https://raw.githubusercontent.com/dokku/dokku/v0.26.6/bootstrap.sh
sudo DOKKU_TAG=v0.26.4 bash bootstrap.sh sudo DOKKU_TAG=v0.26.6 bash bootstrap.sh
``` ```
You can then proceed to configure your server domain (via `dokku domains:set-global`) and user access (via `dokku ssh-keys:add`) to complete the installation. You can then proceed to configure your server domain (via `dokku domains:set-global`) and user access (via `dokku ssh-keys:add`) to complete the installation.

View File

@@ -1,7 +1,7 @@
GO_ARGS ?= GO_ARGS ?=
GO_PLUGIN_MAKE_TARGET ?= build GO_PLUGIN_MAKE_TARGET ?= build
GO_REPO_ROOT := /go/src/github.com/dokku/dokku GO_REPO_ROOT := /go/src/github.com/dokku/dokku
BUILD_IMAGE := golang:1.15.6 BUILD_IMAGE := golang:1.16.10
GO_BUILD_CACHE ?= /tmp/dokku-go-build-cache GO_BUILD_CACHE ?= /tmp/dokku-go-build-cache
GO_MOD_CACHE ?= /tmp/dokku-go-mod-mod GO_MOD_CACHE ?= /tmp/dokku-go-mod-mod
GO_ROOT_MOUNT ?= $$PWD/../..:$(GO_REPO_ROOT) GO_ROOT_MOUNT ?= $$PWD/../..:$(GO_REPO_ROOT)

2
debian/control vendored
View File

@@ -1,5 +1,5 @@
Package: dokku Package: dokku
Version: 0.26.4 Version: 0.26.6
Section: web Section: web
Priority: optional Priority: optional
Architecture: amd64 Architecture: amd64

View File

@@ -25,7 +25,7 @@ The storage plugin supports the following mount points:
> New as of 0.25.5 > New as of 0.25.5
A storage directory can be created with the `storage:ensure-directory` command. This command will create a subdirectory in the recommended `/var/lib/doku/data/storage` path - created during Dokku installation - and prepare it for use with an app. A storage directory can be created with the `storage:ensure-directory` command. This command will create a subdirectory in the recommended `/var/lib/dokku/data/storage` path - created during Dokku installation - and prepare it for use with an app.
```shell ```shell
dokku storage:ensure-directory lollipop dokku storage:ensure-directory lollipop

View File

@@ -35,35 +35,35 @@ dokku plugin:list
``` ```
plugn: dev plugn: dev
00_dokku-standard 0.26.4 enabled dokku core standard plugin 00_dokku-standard 0.26.6 enabled dokku core standard plugin
20_events 0.26.4 enabled dokku core events logging plugin 20_events 0.26.6 enabled dokku core events logging plugin
app-json 0.26.4 enabled dokku core app-json plugin app-json 0.26.6 enabled dokku core app-json plugin
apps 0.26.4 enabled dokku core apps plugin apps 0.26.6 enabled dokku core apps plugin
build-env 0.26.4 enabled dokku core build-env plugin build-env 0.26.6 enabled dokku core build-env plugin
buildpacks 0.26.4 enabled dokku core buildpacks plugin buildpacks 0.26.6 enabled dokku core buildpacks plugin
certs 0.26.4 enabled dokku core certificate management plugin certs 0.26.6 enabled dokku core certificate management plugin
checks 0.26.4 enabled dokku core checks plugin checks 0.26.6 enabled dokku core checks plugin
common 0.26.4 enabled dokku core common plugin common 0.26.6 enabled dokku core common plugin
config 0.26.4 enabled dokku core config plugin config 0.26.6 enabled dokku core config plugin
docker-options 0.26.4 enabled dokku core docker-options plugin docker-options 0.26.6 enabled dokku core docker-options plugin
domains 0.26.4 enabled dokku core domains plugin domains 0.26.6 enabled dokku core domains plugin
enter 0.26.4 enabled dokku core enter plugin enter 0.26.6 enabled dokku core enter plugin
git 0.26.4 enabled dokku core git plugin git 0.26.6 enabled dokku core git plugin
logs 0.26.4 enabled dokku core logs plugin logs 0.26.6 enabled dokku core logs plugin
network 0.26.4 enabled dokku core network plugin network 0.26.6 enabled dokku core network plugin
nginx-vhosts 0.26.4 enabled dokku core nginx-vhosts plugin nginx-vhosts 0.26.6 enabled dokku core nginx-vhosts plugin
plugin 0.26.4 enabled dokku core plugin plugin plugin 0.26.6 enabled dokku core plugin plugin
proxy 0.26.4 enabled dokku core proxy plugin proxy 0.26.6 enabled dokku core proxy plugin
ps 0.26.4 enabled dokku core ps plugin ps 0.26.6 enabled dokku core ps plugin
repo 0.26.4 enabled dokku core repo plugin repo 0.26.6 enabled dokku core repo plugin
resource 0.26.4 enabled dokku core resource plugin resource 0.26.6 enabled dokku core resource plugin
scheduler-docker-local 0.26.4 enabled dokku core scheduler-docker-local plugin scheduler-docker-local 0.26.6 enabled dokku core scheduler-docker-local plugin
shell 0.26.4 enabled dokku core shell plugin shell 0.26.6 enabled dokku core shell plugin
ssh-keys 0.26.4 enabled dokku core ssh-keys plugin ssh-keys 0.26.6 enabled dokku core ssh-keys plugin
storage 0.26.4 enabled dokku core storage plugin storage 0.26.6 enabled dokku core storage plugin
tags 0.26.4 enabled dokku core tags plugin tags 0.26.6 enabled dokku core tags plugin
tar 0.26.4 enabled dokku core tar plugin tar 0.26.6 enabled dokku core tar plugin
trace 0.26.4 enabled dokku core trace plugin trace 0.26.6 enabled dokku core trace plugin
``` ```
> Warning: All plugin commands other than `plugin:list` and `plugin:help` require sudo access and must be run directly from the Dokku server. > Warning: All plugin commands other than `plugin:list` and `plugin:help` require sudo access and must be run directly from the Dokku server.

View File

@@ -2,10 +2,10 @@
<browserconfig> <browserconfig>
<msapplication> <msapplication>
<tile> <tile>
<square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/mstile-70x70.png"/> <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/mstile-70x70.png"/>
<square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/mstile-150x150.png"/> <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/mstile-150x150.png"/>
<square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/mstile-310x310.png"/> <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/mstile-310x310.png"/>
<wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/mstile-310x150.png"/> <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/mstile-310x150.png"/>
<TileColor>#da532c</TileColor> <TileColor>#da532c</TileColor>
</tile> </tile>
</msapplication> </msapplication>

View File

@@ -2,37 +2,37 @@
"name": "Dokku", "name": "Dokku",
"icons": [ "icons": [
{ {
"src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.4\/docs\/assets\/favicons\/android-chrome-36x36.png", "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.6\/docs\/assets\/favicons\/android-chrome-36x36.png",
"sizes": "36x36", "sizes": "36x36",
"type": "image\/png", "type": "image\/png",
"density": "0.75" "density": "0.75"
}, },
{ {
"src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.4\/docs\/assets\/favicons\/android-chrome-48x48.png", "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.6\/docs\/assets\/favicons\/android-chrome-48x48.png",
"sizes": "48x48", "sizes": "48x48",
"type": "image\/png", "type": "image\/png",
"density": "1.0" "density": "1.0"
}, },
{ {
"src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.4\/docs\/assets\/favicons\/android-chrome-72x72.png", "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.6\/docs\/assets\/favicons\/android-chrome-72x72.png",
"sizes": "72x72", "sizes": "72x72",
"type": "image\/png", "type": "image\/png",
"density": "1.5" "density": "1.5"
}, },
{ {
"src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.4\/docs\/assets\/favicons\/android-chrome-96x96.png", "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.6\/docs\/assets\/favicons\/android-chrome-96x96.png",
"sizes": "96x96", "sizes": "96x96",
"type": "image\/png", "type": "image\/png",
"density": "2.0" "density": "2.0"
}, },
{ {
"src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.4\/docs\/assets\/favicons\/android-chrome-144x144.png", "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.6\/docs\/assets\/favicons\/android-chrome-144x144.png",
"sizes": "144x144", "sizes": "144x144",
"type": "image\/png", "type": "image\/png",
"density": "3.0" "density": "3.0"
}, },
{ {
"src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.4\/docs\/assets\/favicons\/android-chrome-192x192.png", "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.26.6\/docs\/assets\/favicons\/android-chrome-192x192.png",
"sizes": "192x192", "sizes": "192x192",
"type": "image\/png", "type": "image\/png",
"density": "4.0" "density": "4.0"

View File

@@ -42,13 +42,13 @@ h1 {
font-size: 1.6em; font-size: 1.6em;
} }
.header .navbar-brand a { .header .navbar-brand a {
background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/dokku.png); background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/dokku.png);
text-indent: 40px; text-indent: 40px;
} }
.blurb { .blurb {
color: #424242; color: #424242;
background-color: #ededed; background-color: #ededed;
background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/gplaypattern.png); background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/gplaypattern.png);
padding: 45px 0; padding: 45px 0;
text-align: center; text-align: center;
} }

View File

@@ -23,6 +23,6 @@
"0.23.9", "0.23.9",
"0.24.10", "0.24.10",
"0.25.7", "0.25.7",
"0.26.4" "0.26.6"
] ]
} }

View File

@@ -29,7 +29,7 @@ The workflow looks like this:
```shell ```shell
# having dokku-arch in ../dokku-arch # having dokku-arch in ../dokku-arch
vagrant up build-arch vagrant up build-arch
# wait for "==> build-arch: ==> Finished making: dokku 0.26.4-2 (Mon Feb 22 23:20:37 CET 2016)" # wait for "==> build-arch: ==> Finished making: dokku 0.26.6-2 (Mon Feb 22 23:20:37 CET 2016)"
cd ../dokku-arch cd ../dokku-arch
git add PKGBUILD .SRCINFO git add PKGBUILD .SRCINFO
git commit -m 'Update to dokku 0.9.9' git commit -m 'Update to dokku 0.9.9'

32
docs/enterprise/pro.md Normal file
View File

@@ -0,0 +1,32 @@
# Dokku Pro
Dokku Pro is a commercial offering that provides a familiar Web UI for all common tasks performed by developers. End users can expect an interface that provides various complex cli commands in an intuitive, app-centric manner, quickly speeding up tasks that might otherwise be difficult for new and old users to perform. Additionally, it provides a way to perform these tasks remotely via a json api, enabling easier, audited remote management of servers. Finally, Dokku Pro provides an alternative, https-based method for deploying code which can be used in environments that lockdown ssh access to servers.
## Purchasing
Dokku Pro may be purchased online by clicking the following purchase link:
<a data-dpd-type="button" data-text="PURCHASE NOW" data-variant="price-right" data-button-size="dpd-large" data-bg-color="469d3d" data-bg-color-hover="5cc052" data-text-color="ffffff" data-pr-bg-color="ffffff" data-pr-color="000000" data-lightbox="1" href="https://dokku.dpdcart.com/cart/add?product_id=217344&amp;method_id=236878">Dokku Pro Purchase Link</a>
> Currently, the server must be able to contact the public internet to validate the license, or it will fail to start. For offline support, inquire for enterprise offline licensing.
## Installation
Dokku Pro is shipped as Debian and RPM packages, and depends on the following files:
- `/etc/default/dokku-pro`: Configures certain environment variables for usage by the dokku-pro binary
- `/etc/dokku-pro/license.key`: Contains the downloaded license key
- `/var/lib/dokku/data/pro/db`: Contains the local dokku-pro database
Please refer to the purchase email for details on configuring Dokku Pro.
## Features and Development
Dokku Pro has the following functionality:
- Shipped as a single binary for ease of use
- JSON-API-compatible API with JWT authentication
- Authenticated HTTP(S) endpoints for git push functionality
- Single Page App (SPA) Web UI exposing app, datastore, and ssh key management
While each release is fairly feature complete, individual features and documentation will expand over time. Feature development follows a monthly release cadence, with individual bug fixes released on an as needed basis.

View File

@@ -3,7 +3,7 @@
Pull the dokku/dokku image: Pull the dokku/dokku image:
```shell ```shell
docker pull dokku/dokku:0.26.4 docker pull dokku/dokku:0.26.6
``` ```
Next, run the image. Next, run the image.
@@ -18,7 +18,7 @@ docker container run \
--publish 8443:443 \ --publish 8443:443 \
--volume /var/lib/dokku:/mnt/dokku \ --volume /var/lib/dokku:/mnt/dokku \
--volume /var/run/docker.sock:/var/run/docker.sock \ --volume /var/run/docker.sock:/var/run/docker.sock \
dokku/dokku:0.26.4 dokku/dokku:0.26.6
``` ```
The above command will start a new docker container that is ready when a message similar to `Runit started as PID 12345` appears. The above command will start a new docker container that is ready when a message similar to `Runit started as PID 12345` appears.

View File

@@ -19,8 +19,8 @@ To install the latest stable version of Dokku, you can run the following shell c
```shell ```shell
# for debian systems, installs Dokku via apt-get # for debian systems, installs Dokku via apt-get
wget https://raw.githubusercontent.com/dokku/dokku/v0.26.4/bootstrap.sh; wget https://raw.githubusercontent.com/dokku/dokku/v0.26.6/bootstrap.sh;
sudo DOKKU_TAG=v0.26.4 bash bootstrap.sh sudo DOKKU_TAG=v0.26.6 bash bootstrap.sh
``` ```
The installation process takes about 5-10 minutes, depending upon internet connection speed. The installation process takes about 5-10 minutes, depending upon internet connection speed.

View File

@@ -10,30 +10,30 @@
<link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css"> <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
<title>Dokku - The smallest PaaS implementation you've ever seen</title> <title>Dokku - The smallest PaaS implementation you've ever seen</title>
<link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/apple-touch-icon-57x57.png"> <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/apple-touch-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/apple-touch-icon-60x60.png"> <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/apple-touch-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/apple-touch-icon-72x72.png"> <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/apple-touch-icon-76x76.png"> <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/apple-touch-icon-76x76.png">
<link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/apple-touch-icon-114x114.png"> <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/apple-touch-icon-114x114.png">
<link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/apple-touch-icon-120x120.png"> <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/apple-touch-icon-120x120.png">
<link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/apple-touch-icon-144x144.png"> <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/apple-touch-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/apple-touch-icon-152x152.png"> <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/apple-touch-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/apple-touch-icon-180x180.png"> <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/apple-touch-icon-180x180.png">
<link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/favicon-32x32.png" sizes="32x32"> <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
<link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192"> <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
<link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/favicon-96x96.png" sizes="96x96"> <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
<link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/favicon-16x16.png" sizes="16x16"> <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
<link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/manifest.json"> <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/manifest.json">
<link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/favicon.ico"> <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/favicon.ico">
<meta name="apple-mobile-web-app-title" content="Dokku"> <meta name="apple-mobile-web-app-title" content="Dokku">
<meta name="application-name" content="Dokku"> <meta name="application-name" content="Dokku">
<meta name="msapplication-TileColor" content="#da532c"> <meta name="msapplication-TileColor" content="#da532c">
<meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/mstile-144x144.png"> <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/mstile-144x144.png">
<meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/browserconfig.xml"> <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/browserconfig.xml">
<meta name="theme-color" content="#ffffff"> <meta name="theme-color" content="#ffffff">
<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet"> <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/style.css" rel="stylesheet"> <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/style.css" rel="stylesheet">
<!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> --> <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
<style> <style>
</style> </style>
@@ -62,6 +62,9 @@
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="https://github.com/dokku/dokku/discussions">Forums</a> <a class="nav-link" href="https://github.com/dokku/dokku/discussions">Forums</a>
</li> </li>
<li class="nav-item">
<a class="nav-link" href="/{{NAME}}/enterprise/pro/">Pro</a>
</li>
</ul> </ul>
</div> </div>
</div> </div>
@@ -95,12 +98,12 @@
<p class="line"> <p class="line">
<span class="path"></span> <span class="path"></span>
<span class="prompt">$</span> <span class="prompt">$</span>
<span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.26.4/bootstrap.sh</span> <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.26.6/bootstrap.sh</span>
</p> </p>
<p class="line"> <p class="line">
<span class="path"></span> <span class="path"></span>
<span class="prompt">$</span> <span class="prompt">$</span>
<span class="command">sudo DOKKU_TAG=v0.26.4 bash bootstrap.sh</span> <span class="command">sudo DOKKU_TAG=v0.26.6 bash bootstrap.sh</span>
</p> </p>
<p class="line"> <p class="line">
<span class="output">&nbsp;# Configure your server domain via `dokku domains:set-global`</span> <span class="output">&nbsp;# Configure your server domain via `dokku domains:set-global`</span>

View File

@@ -9,26 +9,26 @@
<meta name="author" content=""> <meta name="author" content="">
<title>Dokku - {{DOC_TITLE}}</title> <title>Dokku - {{DOC_TITLE}}</title>
<link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/apple-touch-icon-57x57.png"> <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/apple-touch-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/apple-touch-icon-60x60.png"> <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/apple-touch-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/apple-touch-icon-72x72.png"> <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/apple-touch-icon-76x76.png"> <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/apple-touch-icon-76x76.png">
<link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/apple-touch-icon-114x114.png"> <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/apple-touch-icon-114x114.png">
<link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/apple-touch-icon-120x120.png"> <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/apple-touch-icon-120x120.png">
<link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/apple-touch-icon-144x144.png"> <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/apple-touch-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/apple-touch-icon-152x152.png"> <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/apple-touch-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/apple-touch-icon-180x180.png"> <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/apple-touch-icon-180x180.png">
<link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/favicon-32x32.png" sizes="32x32"> <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
<link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192"> <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
<link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/favicon-96x96.png" sizes="96x96"> <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
<link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/favicon-16x16.png" sizes="16x16"> <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
<link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/manifest.json"> <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/manifest.json">
<link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/favicon.ico"> <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/favicon.ico">
<meta name="apple-mobile-web-app-title" content="Dokku"> <meta name="apple-mobile-web-app-title" content="Dokku">
<meta name="application-name" content="Dokku"> <meta name="application-name" content="Dokku">
<meta name="msapplication-TileColor" content="#da532c"> <meta name="msapplication-TileColor" content="#da532c">
<meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/mstile-144x144.png"> <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/mstile-144x144.png">
<meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/favicons/browserconfig.xml"> <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/favicons/browserconfig.xml">
<meta name="theme-color" content="#ffffff"> <meta name="theme-color" content="#ffffff">
<script> <script>
@@ -42,7 +42,7 @@
</script> </script>
<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet"> <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.4/docs/assets/style.css" rel="stylesheet"> <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.26.6/docs/assets/style.css" rel="stylesheet">
<!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> --> <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet"> <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
<style> <style>
@@ -75,6 +75,9 @@
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="https://github.com/dokku/dokku/discussions">Forums</a> <a class="nav-link" href="https://github.com/dokku/dokku/discussions">Forums</a>
</li> </li>
<li class="nav-item">
<a class="nav-link" href="/{{NAME}}/enterprise/pro/">Pro</a>
</li>
</ul> </ul>
</div> </div>
</div> </div>
@@ -103,6 +106,9 @@
<a href="/{{NAME}}/getting-started/troubleshooting/" class="list-group-item">Troubleshooting</a> <a href="/{{NAME}}/getting-started/troubleshooting/" class="list-group-item">Troubleshooting</a>
<a href="/{{NAME}}/getting-started/where-to-get-help/" class="list-group-item">Getting Help</a> <a href="/{{NAME}}/getting-started/where-to-get-help/" class="list-group-item">Getting Help</a>
<a href="#" class="list-group-item disabled">Commercial</a>
<a href="/{{NAME}}/enterprise/pro/" class="list-group-item">Dokku Pro</a>
<a href="#" class="list-group-item disabled">Deployment</a> <a href="#" class="list-group-item disabled">Deployment</a>
<a href="/{{NAME}}/deployment/application-deployment/" class="list-group-item">Deploying an Application</a> <a href="/{{NAME}}/deployment/application-deployment/" class="list-group-item">Deploying an Application</a>
@@ -217,6 +223,7 @@
</div> </div>
<script src="https://cdnjs.cloudflare.com/ajax/libs/anchor-js/1.3.0/anchor.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/anchor-js/1.3.0/anchor.js"></script>
<script src="https://dokku.dpdcart.com/dpd.js"></script>
<script> <script>
// Source: https://github.com/Alhadis/Snippets/blob/master/js/polyfills/IE8-child-elements.js // Source: https://github.com/Alhadis/Snippets/blob/master/js/polyfills/IE8-child-elements.js
if (!('nextElementSibling' in document.documentElement)) { if (!('nextElementSibling' in document.documentElement)) {

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core standard plugin" description = "dokku core standard plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core events logging plugin" description = "dokku core events logging plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/app-json module github.com/dokku/dokku/plugins/app-json
go 1.15 go 1.16
require ( require (
github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core app-json plugin" description = "dokku core app-json plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/apps module github.com/dokku/dokku/plugins/apps
go 1.15 go 1.16
require ( require (
github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core apps plugin" description = "dokku core apps plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core builder-dockerfile plugin" description = "dokku core builder-dockerfile plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core builder-herokuish plugin" description = "dokku core builder-herokuish plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core builder-null plugin" description = "dokku core builder-null plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core builder-pack plugin" description = "dokku core builder-pack plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/builder module github.com/dokku/dokku/plugins/builder
go 1.15 go 1.16
require ( require (
github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core builder plugin" description = "dokku core builder plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/buildpacks module github.com/dokku/dokku/plugins/buildpacks
go 1.15 go 1.16
require ( require (
github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core buildpacks plugin" description = "dokku core buildpacks plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core certificate management plugin" description = "dokku core certificate management plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core checks plugin" description = "dokku core checks plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/common module github.com/dokku/dokku/plugins/common
go 1.15 go 1.16
require ( require (
github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 // indirect github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 // indirect

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core common plugin" description = "dokku core common plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/config module github.com/dokku/dokku/plugins/config
go 1.15 go 1.16
require ( require (
github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core config plugin" description = "dokku core config plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/cron module github.com/dokku/dokku/plugins/cron
go 1.15 go 1.16
require ( require (
github.com/dokku/dokku/plugins/app-json v0.0.0-00010101000000-000000000000 github.com/dokku/dokku/plugins/app-json v0.0.0-00010101000000-000000000000

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core cron plugin" description = "dokku core cron plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/docker-options module github.com/dokku/dokku/plugins/docker-options
go 1.15 go 1.16
require ( require (
github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core docker-options plugin" description = "dokku core docker-options plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core domains plugin" description = "dokku core domains plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core enter plugin" description = "dokku core enter plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core git plugin" description = "dokku core git plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/logs module github.com/dokku/dokku/plugins/logs
go 1.15 go 1.16
require ( require (
github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core logs plugin" description = "dokku core logs plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/network module github.com/dokku/dokku/plugins/network
go 1.15 go 1.16
require ( require (
github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core network plugin" description = "dokku core network plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -62,10 +62,16 @@ func main() {
} }
case "set": case "set":
args := flag.NewFlagSet("network:set", flag.ExitOnError) args := flag.NewFlagSet("network:set", flag.ExitOnError)
global := args.Bool("global", false, "--global: set a global property")
args.Parse(os.Args[2:]) args.Parse(os.Args[2:])
appName := args.Arg(0) appName := args.Arg(0)
property := args.Arg(1) property := args.Arg(1)
value := args.Arg(2) value := args.Arg(2)
if *global {
appName = "--global"
property = args.Arg(0)
value = args.Arg(1)
}
err = network.CommandSet(appName, property, value) err = network.CommandSet(appName, property, value)
default: default:
err = fmt.Errorf("Invalid plugin subcommand call: %s", subcommand) err = fmt.Errorf("Invalid plugin subcommand call: %s", subcommand)

View File

@@ -142,8 +142,10 @@ func CommandReport(appName string, format string, infoFlag string) error {
// CommandSet set or clear a network property for an app // CommandSet set or clear a network property for an app
func CommandSet(appName string, property string, value string) error { func CommandSet(appName string, property string, value string) error {
if err := common.VerifyAppName(appName); err != nil { if appName != "--global" {
return err if err := common.VerifyAppName(appName); err != nil {
return err
}
} }
if property == "bind-all-interfaces" && value == "" { if property == "bind-all-interfaces" && value == "" {

View File

@@ -1,3 +1,3 @@
module github.com/dokku/dokku/plugins/nginx-vhosts module github.com/dokku/dokku/plugins/nginx-vhosts
go 1.15 go 1.16

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core nginx-vhosts plugin" description = "dokku core nginx-vhosts plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core plugin plugin" description = "dokku core plugin plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/proxy module github.com/dokku/dokku/plugins/proxy
go 1.15 go 1.16
require ( require (
github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core proxy plugin" description = "dokku core proxy plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/ps module github.com/dokku/dokku/plugins/ps
go 1.15 go 1.16
require ( require (
github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core ps plugin" description = "dokku core ps plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/registry module github.com/dokku/dokku/plugins/registry
go 1.15 go 1.16
require ( require (
github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core registry plugin" description = "dokku core registry plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/repo module github.com/dokku/dokku/plugins/repo
go 1.15 go 1.16
require ( require (
github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core repo plugin" description = "dokku core repo plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/resource module github.com/dokku/dokku/plugins/resource
go 1.15 go 1.16
require ( require (
github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27 // indirect

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core resource plugin" description = "dokku core resource plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core run plugin" description = "dokku core run plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core scheduler-docker-local plugin" description = "dokku core scheduler-docker-local plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core scheduler-null plugin" description = "dokku core scheduler-null plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/scheduler module github.com/dokku/dokku/plugins/scheduler
go 1.15 go 1.16
require ( require (
github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core shell plugin" description = "dokku core shell plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core ssh-keys plugin" description = "dokku core ssh-keys plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core storage plugin" description = "dokku core storage plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,4 +1,4 @@
[plugin] [plugin]
description = "dokku core trace plugin" description = "dokku core trace plugin"
version = "0.26.4" version = "0.26.6"
[plugin.config] [plugin.config]

View File

@@ -1,5 +1,5 @@
Flask==2.0.2 Flask==2.0.2
Jinja2==3.0.2 Jinja2==3.0.3
Werkzeug==2.0.2 Werkzeug==2.0.2
gunicorn==20.1.0 gunicorn==20.1.0

View File

@@ -1,4 +1,4 @@
module dokku.me/web module dokku.me/web
// +heroku goVersion go1.12 // +heroku goVersion go1.16
go 1.12 go 1.16

View File

@@ -1,3 +1,3 @@
module dokku.me/web module dokku.me/web
go 1.12 go 1.16

View File

@@ -1,3 +1,3 @@
module dokku.me/web module dokku.me/web
go 1.12 go 1.16

View File

@@ -29,3 +29,4 @@
# SC2231 - Quote expansions in this for loop glob to prevent wordsplitting, e.g. "$dir"/*.txt - https://github.com/koalaman/shellcheck/wiki/SC2231 # SC2231 - Quote expansions in this for loop glob to prevent wordsplitting, e.g. "$dir"/*.txt - https://github.com/koalaman/shellcheck/wiki/SC2231
# SC2235 - Use { ..; } instead of (..) to avoid subshell overhead - https://github.com/koalaman/shellcheck/wiki/SC2235 # SC2235 - Use { ..; } instead of (..) to avoid subshell overhead - https://github.com/koalaman/shellcheck/wiki/SC2235
# SC2267 - GNU xargs -i is deprecated in favor of -I{} - https://github.com/koalaman/shellcheck/wiki/SC2267 # SC2267 - GNU xargs -i is deprecated in favor of -I{} - https://github.com/koalaman/shellcheck/wiki/SC2267
# SC2295 - Expansions inside ${..} need to be quoted separately, otherwise they match as patterns - https://github.com/koalaman/shellcheck/wiki/SC2295