Compare commits
93 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
44cb90eff1 | ||
|
|
2584d958e9 | ||
|
|
161d877e8b | ||
|
|
b98154e410 | ||
|
|
7cb0d7fb58 | ||
|
|
c77d323f1f | ||
|
|
3ae416955f | ||
|
|
7480fd51ee | ||
|
|
730e8f73d4 | ||
|
|
d3118b4d07 | ||
|
|
fb79d0f2e8 | ||
|
|
1bbde8fd94 | ||
|
|
ee8bdd4886 | ||
|
|
e36db73864 | ||
|
|
a3a50f193c | ||
|
|
7d917589a4 | ||
|
|
aad283a981 | ||
|
|
047626909c | ||
|
|
5ab170a60a | ||
|
|
ddd5526fed | ||
|
|
b716b61099 | ||
|
|
cadf876d37 | ||
|
|
088608d160 | ||
|
|
4f9b00dfcb | ||
|
|
1d9479e532 | ||
|
|
93eb8be806 | ||
|
|
31d4851089 | ||
|
|
e98d54f0bc | ||
|
|
f7474347b6 | ||
|
|
640f78a23c | ||
|
|
136c868904 | ||
|
|
1587b32a30 | ||
|
|
cb7b1f4ebd | ||
|
|
6df62d052a | ||
|
|
c7ce9dc89c | ||
|
|
5da8bcc3b5 | ||
|
|
aca8df1b09 | ||
|
|
87e9bea6da | ||
|
|
aed99f6193 | ||
|
|
f115815ced | ||
|
|
900e4ac94d | ||
|
|
855090c9e7 | ||
|
|
9b41f7a74e | ||
|
|
8d07ffe775 | ||
|
|
e47f6e5803 | ||
|
|
436574a9ad | ||
|
|
8ac04392f0 | ||
|
|
5bfb43222b | ||
|
|
7ee87c7aa5 | ||
|
|
172779f3d6 | ||
|
|
75ea7862cc | ||
|
|
6ea86f2714 | ||
|
|
a6b047805c | ||
|
|
3ce148dacd | ||
|
|
67dcf34f7a | ||
|
|
db635841f5 | ||
|
|
970b6806c7 | ||
|
|
1dfa02924d | ||
|
|
380e8affba | ||
|
|
725dd8b2a6 | ||
|
|
ff27908dfd | ||
|
|
e6762f2439 | ||
|
|
954d20bd1e | ||
|
|
792b36d5cc | ||
|
|
3f4278ec1d | ||
|
|
a185142170 | ||
|
|
24a30c8d4b | ||
|
|
3c7e5730ec | ||
|
|
c1c1cdd25f | ||
|
|
beea394822 | ||
|
|
1ad89bf53b | ||
|
|
28f76c5ae0 | ||
|
|
94a1f895d0 | ||
|
|
6ad694653a | ||
|
|
724c059721 | ||
|
|
6b78375cdc | ||
|
|
9087664667 | ||
|
|
418ecf67c2 | ||
|
|
dc2bdbc366 | ||
|
|
08a43c1604 | ||
|
|
f5f1eebf63 | ||
|
|
10fed6ecf0 | ||
|
|
9c5cb7d0f0 | ||
|
|
9b72c93a57 | ||
|
|
8cb95063d2 | ||
|
|
5f9a91aac1 | ||
|
|
02af8398c4 | ||
|
|
23a53b5034 | ||
|
|
e5aec5b141 | ||
|
|
4e88c534b7 | ||
|
|
93dd5c72ec | ||
|
|
aa5561b781 | ||
|
|
13bd5864b3 |
@@ -7,3 +7,4 @@ docs
|
|||||||
tests
|
tests
|
||||||
!contrib/dokku-installer.py
|
!contrib/dokku-installer.py
|
||||||
!contrib/dokku-update
|
!contrib/dokku-update
|
||||||
|
!contrib/bash-completion
|
||||||
80
HISTORY.md
80
HISTORY.md
@@ -1,5 +1,85 @@
|
|||||||
# History
|
# History
|
||||||
|
|
||||||
|
## 0.12.8
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
- #3211: @josegonzalez Add missing source of config/functions
|
||||||
|
|
||||||
|
### Documentation
|
||||||
|
|
||||||
|
- #3204: @znz Add `--no-restart` to `config:unset` of `config:help`
|
||||||
|
- #3203: @josegonzalez Clarify issue template
|
||||||
|
|
||||||
|
## 0.12.7
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
- #3200: @josegonzalez fix: correct bash-completion integration
|
||||||
|
|
||||||
|
### New Features
|
||||||
|
|
||||||
|
- #3199: @josegonzalez Update herokuish to 0.4.2
|
||||||
|
- #3198: @josegonzalez Cleanup temporary changes during betafish releases
|
||||||
|
|
||||||
|
## 0.12.6
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
- #3193: @josegonzalez Install bash-completion files correctly
|
||||||
|
- #3179: @josegonzalez Ignore issues with popd when OS versions with stricter security
|
||||||
|
- #3177: @philm ensure dokku-redeploy runs when docker is stopped then started
|
||||||
|
- #3176: @josegonzalez Detect mixed running status on service start
|
||||||
|
|
||||||
|
### New Features
|
||||||
|
|
||||||
|
- #3195: @josegonzalez Allow lower versions of docker-engine
|
||||||
|
- #3181: @malixsys Adding support for `http2_push_preload` to nginx 1.13.9+ configuration
|
||||||
|
- #3183: @josegonzalez Unskip initial herokuish test
|
||||||
|
- #3175: @josegonzalez Implement bash-completion for commands
|
||||||
|
|
||||||
|
### Documentation
|
||||||
|
|
||||||
|
- #3197: @josegonzalez Add a tutorial for deploying applications via gitlab ci
|
||||||
|
- #3194: @josegonzalez Clarify why dokku report information is useful
|
||||||
|
- #3189: @josegonzalez Correct issue with adding a user remotely
|
||||||
|
|
||||||
|
## 0.12.5
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
- #3173: @josegonzalez fix: do not output error message twice
|
||||||
|
|
||||||
|
### New Features
|
||||||
|
|
||||||
|
- #3172: @josegonzalez feat: Add the ability to ignore existing applications during a git clone
|
||||||
|
- #3171: @josegonzalez Allow users to override the reported app url
|
||||||
|
- #3170: @josegonzalez Add ps:startall command
|
||||||
|
|
||||||
|
### Documentation
|
||||||
|
|
||||||
|
- #3159: @zuck Improve docs for default site with HTTPS
|
||||||
|
|
||||||
|
## 0.12.4
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
- #3168: @josegonzalez Use correct variable name when writing deploy-branch value
|
||||||
|
|
||||||
|
## 0.12.3
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
- #3156: @josegonzalez fix: ensure we _always_ include all types in history output
|
||||||
|
|
||||||
|
### Documentation
|
||||||
|
|
||||||
|
- #3163: @josegonzalez Better apt install formatting
|
||||||
|
|
||||||
|
### Other
|
||||||
|
|
||||||
|
- #3153: @scjody Allow specifying a separate DOKKU_HOST_ROOT
|
||||||
|
|
||||||
## 0.12.2
|
## 0.12.2
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|||||||
@@ -1,11 +1,32 @@
|
|||||||
> If you need help figuring out how to use a specific buildpack, or are having issues using multiple buildpacks, please see our [irc or slack channels](http://dokku.viewdocs.io/dokku/getting-started/where-to-get-help/#the-irc-and-slack-channels). Issues pertaining to buildpacks may be closed and locked.
|
> If you need help figuring out how to use a specific buildpack, or are having issues using multiple buildpacks, please see our [irc or slack channels](http://dokku.viewdocs.io/dokku/getting-started/where-to-get-help/#the-irc-and-slack-channels). Issues pertaining to buildpacks may be closed and locked.
|
||||||
|
|
||||||
Description of problem:
|
## Description of problem
|
||||||
|
|
||||||
|
### How reproducible
|
||||||
|
|
||||||
Output of the following commands
|
### Steps to Reproduce
|
||||||
|
|
||||||
|
1.
|
||||||
|
2.
|
||||||
|
3.
|
||||||
|
|
||||||
|
#### Actual Results
|
||||||
|
|
||||||
|
#### Expected Results
|
||||||
|
|
||||||
|
## Environment Information
|
||||||
|
|
||||||
|
### `dokku report APP_NAME` output
|
||||||
|
|
||||||
|
> This is required! Issues missing this information may be closed.
|
||||||
|
>
|
||||||
|
> For problems affecting all applications, the report output for a broken application is useful for our debugging.
|
||||||
|
> You may also run `dokku report` without any arguments to display the top-level reporting information.
|
||||||
|
|
||||||
|
### How (deb/make/rpm) and where (AWS, VirtualBox, physical, etc.) was Dokku installed?:
|
||||||
|
|
||||||
|
### Additional information
|
||||||
|
|
||||||
- `dokku report APP_NAME`
|
|
||||||
- `docker inspect CONTAINER_ID` (if applicable):
|
- `docker inspect CONTAINER_ID` (if applicable):
|
||||||
(BEWARE: `docker inspect` will print environment variables for some commands, be sure you're not exposing any sensitive information when posting issues. You may replace these values with XXXXXXX):
|
(BEWARE: `docker inspect` will print environment variables for some commands, be sure you're not exposing any sensitive information when posting issues. You may replace these values with XXXXXXX):
|
||||||
- `cat /home/dokku/<app>/nginx.conf` (if applicable):
|
- `cat /home/dokku/<app>/nginx.conf` (if applicable):
|
||||||
@@ -18,23 +39,3 @@ Output of the following commands
|
|||||||
- If it exists, the contents of your `Procfile`.
|
- If it exists, the contents of your `Procfile`.
|
||||||
- Output of failing Dokku commands after running `dokku trace on`
|
- Output of failing Dokku commands after running `dokku trace on`
|
||||||
(BEWARE: `trace on` will print environment variables for some commands, be sure you're not exposing any sensitive information when posting issues. You may replace these values with XXXXXXX):
|
(BEWARE: `trace on` will print environment variables for some commands, be sure you're not exposing any sensitive information when posting issues. You may replace these values with XXXXXXX):
|
||||||
|
|
||||||
Environment details (AWS, VirtualBox, physical, etc.):
|
|
||||||
|
|
||||||
How was Dokku installed?:
|
|
||||||
|
|
||||||
How reproducible:
|
|
||||||
|
|
||||||
|
|
||||||
Steps to Reproduce:
|
|
||||||
1.
|
|
||||||
2.
|
|
||||||
3.
|
|
||||||
|
|
||||||
Actual Results:
|
|
||||||
|
|
||||||
|
|
||||||
Expected Results:
|
|
||||||
|
|
||||||
|
|
||||||
Additional info:
|
|
||||||
|
|||||||
@@ -99,8 +99,8 @@ A fresh VM running any of the following operating systems:
|
|||||||
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.12.2/bootstrap.sh
|
wget https://raw.githubusercontent.com/dokku/dokku/v0.12.8/bootstrap.sh
|
||||||
sudo DOKKU_TAG=v0.12.2 bash bootstrap.sh
|
sudo DOKKU_TAG=v0.12.8 bash bootstrap.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
You can then proceed to the ip address or domain name associated with your server to complete the web-based installation.
|
You can then proceed to the ip address or domain name associated with your server to complete the web-based installation.
|
||||||
|
|||||||
31
contrib/bash-completion
Normal file
31
contrib/bash-completion
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
# bash completion for dd -*- shell-script -*-
|
||||||
|
|
||||||
|
_dokku_complete_verify() {
|
||||||
|
declare desc="shows bash completion"
|
||||||
|
declare COMMAND="$1"
|
||||||
|
local COMMANDS=""
|
||||||
|
|
||||||
|
_dokku_complete_goals=$(cat "/var/cache/dokku-completion")
|
||||||
|
|
||||||
|
while read -r fn; do
|
||||||
|
if [[ -z "$COMMAND" ]] || [[ "$fn" == $COMMAND* ]]; then
|
||||||
|
COMMANDS="${COMMANDS};${fn}"
|
||||||
|
fi
|
||||||
|
done <<< "$_dokku_complete_goals"
|
||||||
|
|
||||||
|
echo "${COMMANDS#";"}"
|
||||||
|
}
|
||||||
|
|
||||||
|
_dokku() {
|
||||||
|
local cur prev
|
||||||
|
_get_comp_words_by_ref -n : cur
|
||||||
|
|
||||||
|
if [[ ! -f "/var/cache/dokku-completion" ]] || [[ ! -s "/var/cache/dokku-completion" ]]; then
|
||||||
|
dokku --quiet help --all | awk '/^ /{ print $1 }' | sort > "/var/cache/dokku-completion"
|
||||||
|
fi
|
||||||
|
|
||||||
|
opts=$(_dokku_complete_verify "${cur}")
|
||||||
|
COMPREPLY=($(IFS=";" compgen -W "$opts" -- "$cur"))
|
||||||
|
__ltrim_colon_completions "$cur"
|
||||||
|
} &&
|
||||||
|
complete -F _dokku dokku
|
||||||
@@ -10,7 +10,7 @@ import subprocess
|
|||||||
import sys
|
import sys
|
||||||
import threading
|
import threading
|
||||||
|
|
||||||
VERSION = 'v0.12.2'
|
VERSION = 'v0.12.8'
|
||||||
|
|
||||||
hostname = ''
|
hostname = ''
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -139,7 +139,7 @@ main() {
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
[[ " apps certs help ls nginx shell storage trace version " == *" $CMD "* ]] && unset APP
|
[[ " apps certs help ls nginx shell storage trace version " == *" $CMD "* ]] && unset APP
|
||||||
[[ " certs:chain domains:add-global domains:remove-global domains:set-global ps:rebuildall ps:restartall ps:restore " == *" $CMD "* ]] && unset APP
|
[[ " certs:chain domains:add-global domains:remove-global domains:set-global ps:rebuildall ps:restartall ps:restore ps:startall ps:stopall " == *" $CMD "* ]] && unset APP
|
||||||
[[ "$CMD" =~ events*|plugin*|ssh-keys* ]] && unset APP
|
[[ "$CMD" =~ events*|plugin*|ssh-keys* ]] && unset APP
|
||||||
[[ -n "$APP_ARG" ]] && [[ "$APP_ARG" == "--global" ]] && unset APP
|
[[ -n "$APP_ARG" ]] && [[ "$APP_ARG" == "--global" ]] && unset APP
|
||||||
[[ -n "$@" ]] && [[ -n "$APP" ]] && app_arg="--app $APP"
|
[[ -n "$@" ]] && [[ -n "$APP" ]] && app_arg="--app $APP"
|
||||||
|
|||||||
19
contrib/herokuish-build.Dockerfile
Normal file
19
contrib/herokuish-build.Dockerfile
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
FROM ubuntu:14.04
|
||||||
|
|
||||||
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
|
|
||||||
|
RUN apt-get update && apt-get -y install gcc git build-essential wget ruby-dev ruby1.9.1 lintian rpm help2man man-db
|
||||||
|
RUN command -v fpm > /dev/null || sudo gem install fpm --no-ri --no-rdoc
|
||||||
|
|
||||||
|
ARG WORKDIR=/go/src/github.com/dokku/dokku
|
||||||
|
|
||||||
|
WORKDIR ${WORKDIR}
|
||||||
|
|
||||||
|
COPY . ${WORKDIR}
|
||||||
|
|
||||||
|
RUN make deb-herokuish rpm-herokuish
|
||||||
|
|
||||||
|
RUN mkdir -p /data \
|
||||||
|
&& cp /tmp/*.deb /data \
|
||||||
|
&& cp /tmp/*.rpm /data \
|
||||||
|
&& ls -lha /data/
|
||||||
@@ -237,7 +237,7 @@ fn-repo-update-history-and-commit() {
|
|||||||
declare desc="Updates the history file and commits the changes"
|
declare desc="Updates the history file and commits the changes"
|
||||||
declare CURRENT_VERSION="$1" NEXT_VERSION="$2"
|
declare CURRENT_VERSION="$1" NEXT_VERSION="$2"
|
||||||
local PULL_REQUEST_ID TITLE AUTHOR TYPE CHANGELOG_TEXT
|
local PULL_REQUEST_ID TITLE AUTHOR TYPE CHANGELOG_TEXT
|
||||||
local COMMIT_MESSAGE HISTORY HISTORY_CONTENTS HISTORY_DOCUMENTATION HISTORY_ENHANCEMENT HISTORY_BUG ISSUE_FILE
|
local COMMIT_MESSAGE HISTORY HISTORY_CONTENTS HISTORY_DOCUMENTATION HISTORY_ENHANCEMENT HISTORY_BUG HISTORY_OTHER ISSUE_FILE
|
||||||
|
|
||||||
pushd "$ROOT_DIR" >/dev/null
|
pushd "$ROOT_DIR" >/dev/null
|
||||||
|
|
||||||
@@ -258,8 +258,10 @@ fn-repo-update-history-and-commit() {
|
|||||||
HISTORY_BUG="${HISTORY_BUG}"$'\n'"$CHANGELOG_TEXT"
|
HISTORY_BUG="${HISTORY_BUG}"$'\n'"$CHANGELOG_TEXT"
|
||||||
elif [[ "$TYPE" == "documentation" ]]; then
|
elif [[ "$TYPE" == "documentation" ]]; then
|
||||||
HISTORY_DOCUMENTATION="${HISTORY_DOCUMENTATION}"$'\n'"$CHANGELOG_TEXT"
|
HISTORY_DOCUMENTATION="${HISTORY_DOCUMENTATION}"$'\n'"$CHANGELOG_TEXT"
|
||||||
elif [[ "$TYPE" == "enhancement" ]]; then
|
elif [[ "$TYPE" == "enhancement" ]] || [[ "$TYPE" == "refactor" ]]; then
|
||||||
HISTORY_ENHANCEMENT="${HISTORY_ENHANCEMENT}"$'\n'"$CHANGELOG_TEXT"
|
HISTORY_ENHANCEMENT="${HISTORY_ENHANCEMENT}"$'\n'"$CHANGELOG_TEXT"
|
||||||
|
else
|
||||||
|
HISTORY_OTHER="${HISTORY_OTHER}"$'\n'"$CHANGELOG_TEXT"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
@@ -281,6 +283,11 @@ fn-repo-update-history-and-commit() {
|
|||||||
HISTORY="${HISTORY}"$'\n'"$HISTORY_DOCUMENTATION"
|
HISTORY="${HISTORY}"$'\n'"$HISTORY_DOCUMENTATION"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ "$HISTORY_OTHER" ]]; then
|
||||||
|
HISTORY="${HISTORY}"$'\n\n'"### Other"
|
||||||
|
HISTORY="${HISTORY}"$'\n'"$HISTORY_OTHER"
|
||||||
|
fi
|
||||||
|
|
||||||
sed -i.bak '1d' HISTORY.md && rm HISTORY.md.bak
|
sed -i.bak '1d' HISTORY.md && rm HISTORY.md.bak
|
||||||
HISTORY_CONTENTS="$(cat HISTORY.md)"
|
HISTORY_CONTENTS="$(cat HISTORY.md)"
|
||||||
echo -e "$HISTORY\n$HISTORY_CONTENTS" >HISTORY.md
|
echo -e "$HISTORY\n$HISTORY_CONTENTS" >HISTORY.md
|
||||||
@@ -339,6 +346,10 @@ main() {
|
|||||||
fn-publish-package "$IS_RELEASE" "rpm" "dokku-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error publishing rpm package"
|
fn-publish-package "$IS_RELEASE" "rpm" "dokku-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error publishing rpm package"
|
||||||
|
|
||||||
fn-repo-push-tags "$IS_RELEASE"
|
fn-repo-push-tags "$IS_RELEASE"
|
||||||
|
if [[ "$IS_RELEASE" != "true" ]]; then
|
||||||
|
git reset -q HEAD plugins/*/plugin.toml
|
||||||
|
git checkout -- plugins/*/plugin.toml
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
main "$@"
|
main "$@"
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ fn-publish-package() {
|
|||||||
declare desc="Publishes a package to packagecloud"
|
declare desc="Publishes a package to packagecloud"
|
||||||
declare IS_RELEASE="$1" RELEASE_TYPE="$2" PACKAGE_NAME="$3"
|
declare IS_RELEASE="$1" RELEASE_TYPE="$2" PACKAGE_NAME="$3"
|
||||||
local REPOSITORY=dokku/dokku-betafish DIST=ubuntu
|
local REPOSITORY=dokku/dokku-betafish DIST=ubuntu
|
||||||
local OS_ID ex
|
local OS_ID ex EXIT_CODE=0
|
||||||
|
|
||||||
[[ "$IS_RELEASE" == "true" ]] && REPOSITORY=dokku/dokku
|
[[ "$IS_RELEASE" == "true" ]] && REPOSITORY=dokku/dokku
|
||||||
[[ "$RELEASE_TYPE" == "rpm" ]] && DIST=el/7
|
[[ "$RELEASE_TYPE" == "rpm" ]] && DIST=el/7
|
||||||
|
|||||||
156
contrib/release-herokuish
Executable file
156
contrib/release-herokuish
Executable file
@@ -0,0 +1,156 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -eo pipefail
|
||||||
|
[[ $TRACE ]] && set -x
|
||||||
|
|
||||||
|
readonly ROOT_DIR="$(cd "$(dirname "$(dirname "${BASH_SOURCE[0]}")")" && pwd)"
|
||||||
|
readonly TMP_WORK_DIR="$(mktemp -d "/tmp/dokku-release.XXXX")"
|
||||||
|
readonly DOKKU_GIT_REV="$(git rev-parse HEAD)"
|
||||||
|
|
||||||
|
trap 'rm -rf "$TMP_WORK_DIR" > /dev/null' RETURN INT TERM EXIT
|
||||||
|
|
||||||
|
log-info() {
|
||||||
|
# shellcheck disable=SC2034
|
||||||
|
declare desc="Log info formatter"
|
||||||
|
echo "$*"
|
||||||
|
}
|
||||||
|
|
||||||
|
log-error() {
|
||||||
|
# shellcheck disable=SC2034
|
||||||
|
declare desc="Log error formatter"
|
||||||
|
echo "! $*" 1>&2
|
||||||
|
}
|
||||||
|
|
||||||
|
log-fail() {
|
||||||
|
# shellcheck disable=SC2034
|
||||||
|
declare desc="Log fail formatter"
|
||||||
|
log-error "$*"
|
||||||
|
exit -1
|
||||||
|
}
|
||||||
|
|
||||||
|
fn-build-dokku() {
|
||||||
|
declare desc="Builds dokku packages within a docker container"
|
||||||
|
|
||||||
|
pushd "$ROOT_DIR" >/dev/null
|
||||||
|
docker build \
|
||||||
|
-f "contrib/herokuish-build.Dockerfile" \
|
||||||
|
-t herokuish:build .
|
||||||
|
return "$?"
|
||||||
|
}
|
||||||
|
|
||||||
|
fn-extract-package() {
|
||||||
|
declare desc="Extract packages from a docker container to the root directory"
|
||||||
|
declare PACKAGE_NAME="$1"
|
||||||
|
|
||||||
|
if [[ -z "$PACKAGE_NAME" ]]; then
|
||||||
|
log-error "Invalid deb file specified"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
log-info "(extract-package) writing ${PACKAGE_NAME} to correct path"
|
||||||
|
docker run --rm --entrypoint cat herokuish:build "/data/${PACKAGE_NAME}" > "${ROOT_DIR}/${PACKAGE_NAME}"
|
||||||
|
return "$?"
|
||||||
|
}
|
||||||
|
|
||||||
|
fn-publish-package() {
|
||||||
|
declare desc="Publishes a package to packagecloud"
|
||||||
|
declare IS_RELEASE="$1" RELEASE_TYPE="$2" PACKAGE_NAME="$3"
|
||||||
|
local REPOSITORY=dokku/dokku-betafish DIST=ubuntu
|
||||||
|
local OS_ID ex EXIT_CODE=0
|
||||||
|
|
||||||
|
[[ "$IS_RELEASE" == "true" ]] && REPOSITORY=dokku/dokku
|
||||||
|
[[ "$RELEASE_TYPE" == "rpm" ]] && DIST=el/7
|
||||||
|
|
||||||
|
if [[ "$DIST" == "ubuntu" ]]; then
|
||||||
|
OS_IDS=("trusty" "utopic" "vivid" "wily" "xenial" "yakkety" "zesty" "artful" "bionic")
|
||||||
|
for OS_ID in "${OS_IDS[@]}"; do
|
||||||
|
log-info "(release-herokuish) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
|
||||||
|
package_cloud push "${REPOSITORY}/${DIST}/${OS_ID}" "$PACKAGE_NAME"
|
||||||
|
ex="$?"
|
||||||
|
if [[ "$ex" -ne "0" ]]; then
|
||||||
|
EXIT_CODE="$ex"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
DIST=debian
|
||||||
|
OS_IDS=("wheezy" "jessie" "stretch" "buster")
|
||||||
|
for OS_ID in "${OS_IDS[@]}"; do
|
||||||
|
log-info "(release-herokuish) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
|
||||||
|
package_cloud push "${REPOSITORY}/${DIST}/${OS_ID}" "$PACKAGE_NAME"
|
||||||
|
ex="$?"
|
||||||
|
if [[ "$ex" -ne "0" ]]; then
|
||||||
|
EXIT_CODE="$ex"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
else
|
||||||
|
log-info "(release-herokuish) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
|
||||||
|
package_cloud push "${REPOSITORY}/${DIST}" "$PACKAGE_NAME"
|
||||||
|
EXIT_CODE="$?"
|
||||||
|
fi
|
||||||
|
return "$EXIT_CODE"
|
||||||
|
}
|
||||||
|
|
||||||
|
fn-in-array() {
|
||||||
|
declare desc="return true if value ($1) is in list (all other arguments)"
|
||||||
|
|
||||||
|
local e
|
||||||
|
for e in "${@:2}"; do
|
||||||
|
[[ "$e" == "$1" ]] && return 0
|
||||||
|
done
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
fn-is-release() {
|
||||||
|
declare desc="Checks if a given run is a release run"
|
||||||
|
declare RELEASE="$1"
|
||||||
|
local IS_RELEASE=false
|
||||||
|
if [[ "$RELEASE" == "major" ]] || [[ "$RELEASE" == "minor" ]] || [[ "$RELEASE" == "patch" ]]; then
|
||||||
|
IS_RELEASE=true
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "$IS_RELEASE"
|
||||||
|
}
|
||||||
|
|
||||||
|
fn-require-bin() {
|
||||||
|
declare desc="Checks that a binary exists"
|
||||||
|
declare BINARY="$1"
|
||||||
|
if ! command -v "$BINARY" &>/dev/null; then
|
||||||
|
log-fail "Missing ${BINARY}, please install it"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
main() {
|
||||||
|
declare RELEASE="$1"
|
||||||
|
local NEXT_VERSION
|
||||||
|
local VALID_RELEASE_LEVELS=("major" "minor" "patch" "betafish")
|
||||||
|
|
||||||
|
if [[ "$RELEASE" == '--trace' ]]; then
|
||||||
|
shift 1
|
||||||
|
RELEASE="$1"
|
||||||
|
TRACE=1 && set -x
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -z "$RELEASE" ]]; then
|
||||||
|
log-fail "Argument 1 must be one of [major, minor, patch, betafish], none given"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! fn-in-array "$RELEASE" "${VALID_RELEASE_LEVELS[@]}"; then
|
||||||
|
log-fail "Argument 1 must be one of [major, minor, patch, betafish], '${RELEASE}' given"
|
||||||
|
fi
|
||||||
|
|
||||||
|
fn-require-bin "docker"
|
||||||
|
fn-require-bin "package_cloud"
|
||||||
|
[[ -n "$PACKAGECLOUD_API_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_API_TOKEN environment variable"
|
||||||
|
|
||||||
|
NEXT_VERSION="$(grep HEROKUISH_VERSION deb.mk | head -n1 | cut -d'=' -f2 | xargs)"
|
||||||
|
IS_RELEASE="$(fn-is-release "$RELEASE")"
|
||||||
|
|
||||||
|
fn-build-dokku || log-fail "Error building package"
|
||||||
|
|
||||||
|
fn-extract-package "herokuish_${NEXT_VERSION}_amd64.deb" || log-fail "Error extracting deb package"
|
||||||
|
fn-extract-package "herokuish-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error extracting rpm package"
|
||||||
|
|
||||||
|
fn-publish-package "$IS_RELEASE" "deb" "herokuish_${NEXT_VERSION}_amd64.deb" || log-fail "Error publishing deb package"
|
||||||
|
fn-publish-package "$IS_RELEASE" "rpm" "herokuish-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error publishing rpm package"
|
||||||
|
}
|
||||||
|
|
||||||
|
main "$@"
|
||||||
4
deb.mk
4
deb.mk
@@ -1,6 +1,6 @@
|
|||||||
HEROKUISH_DESCRIPTION = 'Herokuish uses Docker and Buildpacks to build applications like Heroku'
|
HEROKUISH_DESCRIPTION = 'Herokuish uses Docker and Buildpacks to build applications like Heroku'
|
||||||
HEROKUISH_REPO_NAME ?= gliderlabs/herokuish
|
HEROKUISH_REPO_NAME ?= gliderlabs/herokuish
|
||||||
HEROKUISH_VERSION ?= 0.4.0
|
HEROKUISH_VERSION ?= 0.4.2
|
||||||
HEROKUISH_ARCHITECTURE = amd64
|
HEROKUISH_ARCHITECTURE = amd64
|
||||||
HEROKUISH_PACKAGE_NAME = herokuish_$(HEROKUISH_VERSION)_$(HEROKUISH_ARCHITECTURE).deb
|
HEROKUISH_PACKAGE_NAME = herokuish_$(HEROKUISH_VERSION)_$(HEROKUISH_ARCHITECTURE).deb
|
||||||
|
|
||||||
@@ -117,6 +117,7 @@ deb-dokku:
|
|||||||
mkdir -p /tmp/tmp /tmp/build
|
mkdir -p /tmp/tmp /tmp/build
|
||||||
|
|
||||||
cp -r debian /tmp/build/DEBIAN
|
cp -r debian /tmp/build/DEBIAN
|
||||||
|
mkdir -p /tmp/build/usr/share/bash-completion/completions
|
||||||
mkdir -p /tmp/build/usr/bin
|
mkdir -p /tmp/build/usr/bin
|
||||||
mkdir -p /tmp/build/usr/share/doc/dokku
|
mkdir -p /tmp/build/usr/share/doc/dokku
|
||||||
mkdir -p /tmp/build/usr/share/dokku/contrib
|
mkdir -p /tmp/build/usr/share/dokku/contrib
|
||||||
@@ -126,6 +127,7 @@ deb-dokku:
|
|||||||
|
|
||||||
cp dokku /tmp/build/usr/bin
|
cp dokku /tmp/build/usr/bin
|
||||||
cp LICENSE /tmp/build/usr/share/doc/dokku/copyright
|
cp LICENSE /tmp/build/usr/share/doc/dokku/copyright
|
||||||
|
cp contrib/bash-completion /tmp/build/usr/share/bash-completion/completions/dokku
|
||||||
find . -name ".DS_Store" -depth -exec rm {} \;
|
find . -name ".DS_Store" -depth -exec rm {} \;
|
||||||
$(MAKE) go-build
|
$(MAKE) go-build
|
||||||
cp common.mk /tmp/build/var/lib/dokku/core-plugins/common.mk
|
cp common.mk /tmp/build/var/lib/dokku/core-plugins/common.mk
|
||||||
|
|||||||
4
debian/control
vendored
4
debian/control
vendored
@@ -1,9 +1,9 @@
|
|||||||
Package: dokku
|
Package: dokku
|
||||||
Version: 0.12.2
|
Version: 0.12.8
|
||||||
Section: web
|
Section: web
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Architecture: amd64
|
Architecture: amd64
|
||||||
Depends: locales, git, make, curl, gcc, man-db, netcat, sshcommand (>= 0.6.0), gliderlabs-sigil, docker-engine-cs (>= 1.9.1) | docker-engine (>= 1.9.1) | docker-io (>= 1.9.1) | docker-ce | docker-ee, software-properties-common, python-software-properties | python3-software-properties, rsyslog
|
Depends: locales, git, make, curl, gcc, man-db, netcat, sshcommand (>= 0.6.0), gliderlabs-sigil, docker-engine-cs (>= 1.7.1) | docker-engine (>= 1.7.1) | docker-io (>= 1.7.1) | docker-ce | docker-ee, software-properties-common, python-software-properties | python3-software-properties, rsyslog
|
||||||
Recommends: herokuish (>= 0.3.4), parallel, dokku-update
|
Recommends: herokuish (>= 0.3.4), parallel, dokku-update
|
||||||
Pre-Depends: nginx (>= 1.8.0) | openresty, dnsutils, cgroupfs-mount | cgroup-lite, plugn (>= 0.3.0), sudo, python2.7, debconf
|
Pre-Depends: nginx (>= 1.8.0) | openresty, dnsutils, cgroupfs-mount | cgroup-lite, plugn (>= 0.3.0), sudo, python2.7, debconf
|
||||||
Maintainer: Jose Diaz-Gonzalez <dokku@josediazgonzalez.com>
|
Maintainer: Jose Diaz-Gonzalez <dokku@josediazgonzalez.com>
|
||||||
|
|||||||
@@ -31,31 +31,31 @@ dokku plugin
|
|||||||
|
|
||||||
```
|
```
|
||||||
plugn: dev
|
plugn: dev
|
||||||
00_dokku-standard 0.12.2 enabled dokku core standard plugin
|
00_dokku-standard 0.12.8 enabled dokku core standard plugin
|
||||||
20_events 0.12.2 enabled dokku core events logging plugin
|
20_events 0.12.8 enabled dokku core events logging plugin
|
||||||
apps 0.12.2 enabled dokku core apps plugin
|
apps 0.12.8 enabled dokku core apps plugin
|
||||||
build-env 0.12.2 enabled dokku core build-env plugin
|
build-env 0.12.8 enabled dokku core build-env plugin
|
||||||
certs 0.12.2 enabled dokku core certificate management plugin
|
certs 0.12.8 enabled dokku core certificate management plugin
|
||||||
checks 0.12.2 enabled dokku core checks plugin
|
checks 0.12.8 enabled dokku core checks plugin
|
||||||
common 0.12.2 enabled dokku core common plugin
|
common 0.12.8 enabled dokku core common plugin
|
||||||
config 0.12.2 enabled dokku core config plugin
|
config 0.12.8 enabled dokku core config plugin
|
||||||
docker-options 0.12.2 enabled dokku core docker-options plugin
|
docker-options 0.12.8 enabled dokku core docker-options plugin
|
||||||
domains 0.12.2 enabled dokku core domains plugin
|
domains 0.12.8 enabled dokku core domains plugin
|
||||||
enter 0.12.2 enabled dokku core enter plugin
|
enter 0.12.8 enabled dokku core enter plugin
|
||||||
git 0.12.2 enabled dokku core git plugin
|
git 0.12.8 enabled dokku core git plugin
|
||||||
logs 0.12.2 enabled dokku core logs plugin
|
logs 0.12.8 enabled dokku core logs plugin
|
||||||
named-containers 0.12.2 enabled dokku core named containers plugin
|
named-containers 0.12.8 enabled dokku core named containers plugin
|
||||||
network 0.12.2 enabled dokku core network plugin
|
network 0.12.8 enabled dokku core network plugin
|
||||||
nginx-vhosts 0.12.2 enabled dokku core nginx-vhosts plugin
|
nginx-vhosts 0.12.8 enabled dokku core nginx-vhosts plugin
|
||||||
plugin 0.12.2 enabled dokku core plugin plugin
|
plugin 0.12.8 enabled dokku core plugin plugin
|
||||||
proxy 0.12.2 enabled dokku core proxy plugin
|
proxy 0.12.8 enabled dokku core proxy plugin
|
||||||
ps 0.12.2 enabled dokku core ps plugin
|
ps 0.12.8 enabled dokku core ps plugin
|
||||||
repo 0.12.2 enabled dokku core repo plugin
|
repo 0.12.8 enabled dokku core repo plugin
|
||||||
shell 0.12.2 enabled dokku core shell plugin
|
shell 0.12.8 enabled dokku core shell plugin
|
||||||
ssh-keys 0.12.2 enabled dokku core ssh-keys plugin
|
ssh-keys 0.12.8 enabled dokku core ssh-keys plugin
|
||||||
storage 0.12.2 enabled dokku core storage plugin
|
storage 0.12.8 enabled dokku core storage plugin
|
||||||
tags 0.12.2 enabled dokku core tags plugin
|
tags 0.12.8 enabled dokku core tags plugin
|
||||||
tar 0.12.2 enabled dokku core tar plugin
|
tar 0.12.8 enabled dokku core tar plugin
|
||||||
```
|
```
|
||||||
|
|
||||||
Installing a plugin is easy as well using the `plugin:install` command. This command will also trigger the `install` pluginhook on all existing plugins.
|
Installing a plugin is easy as well using the `plugin:install` command. This command will also trigger the `install` pluginhook on all existing plugins.
|
||||||
|
|||||||
@@ -2,10 +2,10 @@
|
|||||||
<browserconfig>
|
<browserconfig>
|
||||||
<msapplication>
|
<msapplication>
|
||||||
<tile>
|
<tile>
|
||||||
<square70x70logo src="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/mstile-70x70.png"/>
|
<square70x70logo src="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/mstile-70x70.png"/>
|
||||||
<square150x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/mstile-150x150.png"/>
|
<square150x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/mstile-150x150.png"/>
|
||||||
<square310x310logo src="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/mstile-310x310.png"/>
|
<square310x310logo src="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/mstile-310x310.png"/>
|
||||||
<wide310x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/mstile-310x150.png"/>
|
<wide310x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/mstile-310x150.png"/>
|
||||||
<TileColor>#da532c</TileColor>
|
<TileColor>#da532c</TileColor>
|
||||||
</tile>
|
</tile>
|
||||||
</msapplication>
|
</msapplication>
|
||||||
|
|||||||
@@ -2,37 +2,37 @@
|
|||||||
"name": "Dokku",
|
"name": "Dokku",
|
||||||
"icons": [
|
"icons": [
|
||||||
{
|
{
|
||||||
"src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.2\/docs\/assets\/favicons\/android-chrome-36x36.png",
|
"src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.8\/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.rawgit.com\/progrium\/dokku\/v0.12.2\/docs\/assets\/favicons\/android-chrome-48x48.png",
|
"src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.8\/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.rawgit.com\/progrium\/dokku\/v0.12.2\/docs\/assets\/favicons\/android-chrome-72x72.png",
|
"src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.8\/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.rawgit.com\/progrium\/dokku\/v0.12.2\/docs\/assets\/favicons\/android-chrome-96x96.png",
|
"src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.8\/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.rawgit.com\/progrium\/dokku\/v0.12.2\/docs\/assets\/favicons\/android-chrome-144x144.png",
|
"src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.8\/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.rawgit.com\/progrium\/dokku\/v0.12.2\/docs\/assets\/favicons\/android-chrome-192x192.png",
|
"src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.12.8\/docs\/assets\/favicons\/android-chrome-192x192.png",
|
||||||
"sizes": "192x192",
|
"sizes": "192x192",
|
||||||
"type": "image\/png",
|
"type": "image\/png",
|
||||||
"density": "4.0"
|
"density": "4.0"
|
||||||
|
|||||||
@@ -39,13 +39,13 @@ h1 {
|
|||||||
font-size: 1.6em;
|
font-size: 1.6em;
|
||||||
}
|
}
|
||||||
.header .navbar-brand a {
|
.header .navbar-brand a {
|
||||||
background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/dokku.png);
|
background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.12.8/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.rawgit.com/dokku/dokku/v0.12.2/docs/assets/gplaypattern.png);
|
background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/gplaypattern.png);
|
||||||
padding: 45px 0;
|
padding: 45px 0;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
@@ -65,7 +65,7 @@ h1 {
|
|||||||
display: block;
|
display: block;
|
||||||
line-height: 1.3em;
|
line-height: 1.3em;
|
||||||
margin: 45px auto;
|
margin: 45px auto;
|
||||||
max-width: 750px;
|
max-width: 860px;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
.quickstart-code .title {
|
.quickstart-code .title {
|
||||||
@@ -151,7 +151,7 @@ h1 {
|
|||||||
font-size: 1.6em;
|
font-size: 1.6em;
|
||||||
line-height: 1.3em;
|
line-height: 1.3em;
|
||||||
margin: 45px auto;
|
margin: 45px auto;
|
||||||
max-width: 750px;
|
max-width: 860px;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,6 @@
|
|||||||
"0.9.4",
|
"0.9.4",
|
||||||
"0.10.5",
|
"0.10.5",
|
||||||
"0.11.6",
|
"0.11.6",
|
||||||
"0.12.2"
|
"0.12.8"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
106
docs/community/tutorials/deploying-with-gitlab-ci.md
Normal file
106
docs/community/tutorials/deploying-with-gitlab-ci.md
Normal file
@@ -0,0 +1,106 @@
|
|||||||
|
# Deploying with Gitlab CI
|
||||||
|
|
||||||
|
Gitlab-CI can be used to automatically deploy a Dokku application using the [ilyasemenov/gitlab-ci-git-push image](https://github.com/IlyaSemenov/gitlab-ci-git-push) docker image.
|
||||||
|
|
||||||
|
## Prerequisites
|
||||||
|
|
||||||
|
Make sure you have a Gitlab account and a Dokku project hosted on Gitlab. This method works whether if you are using buildpacks or Dockerfile.
|
||||||
|
|
||||||
|
Make sure you have set up an app on the remote machine following [these instructions](http://dokku.viewdocs.io/dokku/deployment/application-deployment/) and can successfully deploy to it from the local machine.
|
||||||
|
|
||||||
|
## Deploy automatically to production
|
||||||
|
|
||||||
|
### Add a secret variable
|
||||||
|
|
||||||
|
Browse to the repository in question and visit the following path: `the Gitlab project > Settings > CI/CD.`
|
||||||
|
|
||||||
|
Click on `Secret variables > Expand` and fill in the blanks.
|
||||||
|
|
||||||
|
- Key: `SSH_PRIVATE_KEY`
|
||||||
|
- Value: paste in an SSH private key registered in Dokku:
|
||||||
|
|
||||||
|
-----BEGIN RSA PRIVATE KEY-----
|
||||||
|
...
|
||||||
|
-----END RSA PRIVATE KEY-----
|
||||||
|
|
||||||
|
- Environment scope: `production` (This make sure that `SSH_PRIVATE_KEY` is not available on merge requests or tests)
|
||||||
|
- Protected: Do not check this checkbox unless you know what you are doing
|
||||||
|
|
||||||
|
### Add CI script
|
||||||
|
|
||||||
|
Create a file named `.gitlab-ci.yml` at the root directory of the repository with the following contents:
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
stages:
|
||||||
|
- deploy
|
||||||
|
|
||||||
|
variables:
|
||||||
|
APP_NAME: node-js-app
|
||||||
|
|
||||||
|
deploy:
|
||||||
|
image: ilyasemenov/gitlab-ci-git-push
|
||||||
|
stage: deploy
|
||||||
|
environment:
|
||||||
|
name: production
|
||||||
|
url: https://$APP_NAME.dokku.me/
|
||||||
|
only:
|
||||||
|
- master
|
||||||
|
script:
|
||||||
|
- git-push ssh://dokku@dokku.me:22/$APP_NAME
|
||||||
|
```
|
||||||
|
|
||||||
|
You will need to modify the `APP_NAME` variable to the correct value for your application name.
|
||||||
|
|
||||||
|
Running `git push origin master` will now trigger a gitlab-ci pipeline that will automatically deploy your application to your Dokku server. Go to your project on Gitlab and visit "Project > Pipelines" to see the deployment log.
|
||||||
|
|
||||||
|
|
||||||
|
## Review Applications
|
||||||
|
|
||||||
|
One useful feature of gitlab is to be able to create review applications for non-production branches. This allows teams to review changes _before_ they are pushed to production. First, recreate the `SSH_PRIVATE_KEY` secret - do not delete the existing secret - but scoped to the `review/*` environment. This will allow non-production gitlab environments access to the secret.
|
||||||
|
|
||||||
|
Next, we'll need to create the `review_app` gitlab job in our `.gitlab-ci.yaml`.
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
review_app:
|
||||||
|
image: ilyasemenov/gitlab-ci-git-push
|
||||||
|
stage: deploy
|
||||||
|
environment:
|
||||||
|
name: review/$CI_ENVIRONMENT_SLUG
|
||||||
|
url: https://$CI_ENVIRONMENT_SLUG.dokku.me/
|
||||||
|
on_stop: stop_review_app
|
||||||
|
only:
|
||||||
|
- branches
|
||||||
|
except:
|
||||||
|
- master
|
||||||
|
script:
|
||||||
|
- mkdir -p ~/.ssh && echo "$SSH_PRIVATE_KEY" | tr -d '\r' > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa
|
||||||
|
- ssh-keyscan -H 22 "dokku.me" >> ~/.ssh/known_hosts
|
||||||
|
- ssh -t dokku@dokku.me -- apps:clone --ignore-existing --skip-deploy "$APP_NAME" "$CI_ENVIRONMENT_SLUG"
|
||||||
|
- git-push ssh://dokku@dokku.me:22/$CI_ENVIRONMENT_SLUG
|
||||||
|
```
|
||||||
|
|
||||||
|
The first two lines ensure that Gitlab can talk to the Dokku server. Next, we take advantage of the `apps:clone` command, and clone the existing application and all of it's configuration to a new location. If the new application already exists, the third line of the `script` step will be ignored. We also ignore the first deploy script to speed up the cloning process. Finally, the fourth line of the `script` step will deploy the code as normal.
|
||||||
|
|
||||||
|
The above only runs for non-master branches, and will _also_ trigger an `on_stop` job called `stop_review_app`. When the branch is deleted or the code is merged, the `stop_review_app` job will be triggered.
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
stop_review_app:
|
||||||
|
image: ilyasemenov/gitlab-ci-git-push
|
||||||
|
stage: deploy
|
||||||
|
environment:
|
||||||
|
name: review/$CI_ENVIRONMENT_SLUG
|
||||||
|
action: stop
|
||||||
|
when: manual
|
||||||
|
script:
|
||||||
|
- mkdir -p ~/.ssh && echo "$SSH_PRIVATE_KEY" | tr -d '\r' > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa
|
||||||
|
- ssh-keyscan -H 22 "dokku.me" >> ~/.ssh/known_hosts
|
||||||
|
- ssh -t dokku@dokku.me -- --force apps:destroy "$CI_ENVIRONMENT_SLUG"
|
||||||
|
```
|
||||||
|
|
||||||
|
The `stop_review_app` step will delete the temporary application, cleaning up now unused server resources.
|
||||||
|
|
||||||
|
Going further, the following modifications can be done:
|
||||||
|
|
||||||
|
- Notify via chat whenever a review application is created/destroyed.
|
||||||
|
- Push to a separate, staging server as opposed to a production server.
|
||||||
|
- Clone a "staging" application so that review applications do not affect production datasets.
|
||||||
@@ -3,7 +3,10 @@
|
|||||||
In order to leverage cloud-provider facilities like _attachable volumes_, (_a.k.a. block storage_)
|
In order to leverage cloud-provider facilities like _attachable volumes_, (_a.k.a. block storage_)
|
||||||
the following is an easy tutorial to achieve Dokku runs on them.
|
the following is an easy tutorial to achieve Dokku runs on them.
|
||||||
|
|
||||||
|
> Warning: If the block storage is not available and attached on boot it is possible that containers will not correctly start. Please keep this in mind when considering moving Dokku and/or Docker to network attached storage.
|
||||||
|
|
||||||
## Tutorial
|
## Tutorial
|
||||||
|
|
||||||
The following is intended to be executed on the dokku host machine as `root`.
|
The following is intended to be executed on the dokku host machine as `root`.
|
||||||
Say, _for instance_, that our volume is mapped into the systems as `/dev/vdb1`.
|
Say, _for instance_, that our volume is mapped into the systems as `/dev/vdb1`.
|
||||||
|
|
||||||
|
|||||||
@@ -131,13 +131,29 @@ Create the file at `/etc/nginx/conf.d/00-default-vhost.conf`:
|
|||||||
|
|
||||||
```nginx
|
```nginx
|
||||||
server {
|
server {
|
||||||
listen 80 default_server;
|
listen 80 default_server;
|
||||||
listen [::]:80 default_server;
|
server_name _;
|
||||||
|
access_log off;
|
||||||
server_name _;
|
return 410;
|
||||||
return 410;
|
|
||||||
log_not_found off;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# To handle HTTPS requests, you can uncomment the following section.
|
||||||
|
#
|
||||||
|
# Please note that in order to let this work as expected, you need a valid
|
||||||
|
# SSL certificate for any domains being served. Browsers will show SSL
|
||||||
|
# errors in all other cases.
|
||||||
|
#
|
||||||
|
# Note that the key and certificate files in the below example need to
|
||||||
|
# be copied into /etc/nginx/ssl/ folder.
|
||||||
|
#
|
||||||
|
# server {
|
||||||
|
# listen 443 ssl;
|
||||||
|
# server_name _;
|
||||||
|
# ssl_certificate /etc/nginx/ssl/cert.crt;
|
||||||
|
# ssl_certificate_key /etc/nginx/ssl/cert.key;
|
||||||
|
# access_log off;
|
||||||
|
# return 410;
|
||||||
|
# }
|
||||||
```
|
```
|
||||||
|
|
||||||
Make sure to reload nginx after creating this file by running `service nginx reload`.
|
Make sure to reload nginx after creating this file by running `service nginx reload`.
|
||||||
|
|||||||
@@ -5,11 +5,13 @@ Typically an application will require some configuration to run properly. Dokku
|
|||||||
The `config` plugin provides the following commands to manage your variables:
|
The `config` plugin provides the following commands to manage your variables:
|
||||||
|
|
||||||
```
|
```
|
||||||
config (<app>|--global) Display all global or app-specific config vars
|
config (<app>|--global) Pretty-print an app or global environment
|
||||||
config:get (<app>|--global) KEY Display a global or app-specific config value
|
config:get (<app>|--global) KEY Display a global or app-specific config value
|
||||||
config:set (<app>|--global) KEY1=VALUE1 [KEY2=VALUE2 ...] Set one or more config vars
|
config:set [--encoded] [--no-restart] (<app>|--global) KEY1=VALUE1 [KEY2=VALUE2 ...] Set one or more config vars
|
||||||
config:unset (<app>|--global) KEY1 [KEY2 ...] Unset one or more config vars
|
config:unset [--no-restart] (<app>|--global) KEY1 [KEY2 ...] Unset one or more config vars
|
||||||
config:export [--format=FORMAT] [--merged] (<app>|--global) Export all global or app-specific configuration
|
config:export (<app>|--global) [--envfile] Export a global or app environment
|
||||||
|
config:keys (<app>|--global) [--merged] Show keys set in environment
|
||||||
|
config:bundle (<app>|--global) [--merged] Bundle environment into tarfile
|
||||||
```
|
```
|
||||||
|
|
||||||
The variables are available both at run time and during the application build/compilation step for buildpack-based deploys. For security reasons - and as per [docker recommendations](https://github.com/docker/docker/issues/13490) - Dockerfile-based deploys have variables available *only* during runtime, as noted in [this issue](https://github.com/dokku/dokku/issues/1860).
|
The variables are available both at run time and during the application build/compilation step for buildpack-based deploys. For security reasons - and as per [docker recommendations](https://github.com/docker/docker/issues/13490) - Dockerfile-based deploys have variables available *only* during runtime, as noted in [this issue](https://github.com/dokku/dokku/issues/1860).
|
||||||
|
|||||||
@@ -158,6 +158,12 @@ By default, Dokku will deploy this new application, though you can skip the depl
|
|||||||
dokku apps:clone --skip-deploy node-js-app io-js-app
|
dokku apps:clone --skip-deploy node-js-app io-js-app
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Finally, if the application already exists, you may wish to ignore errors resulting from attempting to clone over it. To do so, you can use the `--ignore-existing` flag. A warning will be emitted, but the command will return 0.
|
||||||
|
|
||||||
|
```shell
|
||||||
|
dokku apps:clone --ignore-existing node-js-app io-js-app
|
||||||
|
```
|
||||||
|
|
||||||
### Locking app deploys
|
### Locking app deploys
|
||||||
|
|
||||||
> New as of 0.11.6
|
> New as of 0.11.6
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ ps:restartall # Restart all deployed app contai
|
|||||||
ps:scale <app> <proc>=<count> [<proc>=<count>] # Get/Set how many instances of a given process to run
|
ps:scale <app> <proc>=<count> [<proc>=<count>] # Get/Set how many instances of a given process to run
|
||||||
ps:set-restart-policy <app> <policy> # Sets app restart-policy
|
ps:set-restart-policy <app> <policy> # Sets app restart-policy
|
||||||
ps:start <app> # Start app container(s)
|
ps:start <app> # Start app container(s)
|
||||||
|
ps:startall # Start all deployed app containers
|
||||||
ps:stop <app> # Stop app container(s)
|
ps:stop <app> # Stop app container(s)
|
||||||
ps:stopall # Stop all app container(s)
|
ps:stopall # Stop all app container(s)
|
||||||
```
|
```
|
||||||
@@ -114,6 +115,16 @@ All stopped containers can be started using the `ps:start` command. This is simi
|
|||||||
dokku ps:start node-js-app
|
dokku ps:start node-js-app
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### Starting all applications
|
||||||
|
|
||||||
|
In some cases, it may be necessary to start all applications from scratch - eg. if all Docker containers have been manually stopped. This can be executed via the `ps:startall` command, which supports parallelism in the same manner `ps:rebuildall`, `ps:restartall`, and `ps:stopall` do.
|
||||||
|
|
||||||
|
Be aware that no action will be taken if the application containers are running.
|
||||||
|
|
||||||
|
```shell
|
||||||
|
dokku ps:startall
|
||||||
|
```
|
||||||
|
|
||||||
## Restart Policies
|
## Restart Policies
|
||||||
|
|
||||||
> New as of 0.7.0
|
> New as of 0.7.0
|
||||||
|
|||||||
@@ -50,20 +50,13 @@ b7:76:27:4f:30:90:21:ae:d4:1e:70:20:35:3f:06:d6
|
|||||||
|
|
||||||
> `KEY_NAME` is a unique name which is used to identify public keys. Attempting to re-use a key name will result in an error. The ssh (git) user is *always* `dokku`, as this is the system user that the `dokku` binary uses to perform all it's actions.
|
> `KEY_NAME` is a unique name which is used to identify public keys. Attempting to re-use a key name will result in an error. The ssh (git) user is *always* `dokku`, as this is the system user that the `dokku` binary uses to perform all it's actions.
|
||||||
|
|
||||||
Admin users and root can also add keys remotely:
|
Admin users and root can add keys remotely by specifying the `dokku` bin on their `ssh` command:
|
||||||
|
|
||||||
```shell
|
|
||||||
cat ~/.ssh/id_rsa.pub | ssh dokku@dokku.me ssh-keys:add KEY_NAME
|
|
||||||
```
|
|
||||||
|
|
||||||
If you are using an ssh user other than `dokku`, then you'll also need to specify the `dokku` bin:
|
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
cat ~/.ssh/id_rsa.pub | ssh root@dokku.me dokku ssh-keys:add KEY_NAME
|
cat ~/.ssh/id_rsa.pub | ssh root@dokku.me dokku ssh-keys:add KEY_NAME
|
||||||
```
|
```
|
||||||
|
|
||||||
|
If you are using the vagrant installation, you can also use the `make vagrant-acl-add` target to add your public key to Dokku (it will use your host username as the `USER`):
|
||||||
Finally, if you are using the vagrant installation, you can also use the `make vagrant-acl-add` target to add your public key to Dokku (it will use your host username as the `USER`):
|
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
cat ~/.ssh/id_rsa.pub | make vagrant-acl-add
|
cat ~/.ssh/id_rsa.pub | make vagrant-acl-add
|
||||||
|
|||||||
@@ -29,6 +29,30 @@ The following plugin triggers describe those available to a Dokku installation.
|
|||||||
|
|
||||||
> The example plugin trigger code is not guaranteed to be implemented as in within dokku, and are merely simplified examples. Please look at the Dokku source for larger, more in-depth examples.
|
> The example plugin trigger code is not guaranteed to be implemented as in within dokku, and are merely simplified examples. Please look at the Dokku source for larger, more in-depth examples.
|
||||||
|
|
||||||
|
### `app-urls`
|
||||||
|
|
||||||
|
- Description: Allows you to change the urls Dokku reports for an application. Will override any auto-detected urls.
|
||||||
|
- Invoked by: `dokku deploy`, `dokku url`, and `dokku urls`
|
||||||
|
- Arguments: `$APP $URL_TYPE`
|
||||||
|
- Example:
|
||||||
|
|
||||||
|
```shell
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
# Sets the domain to `internal.tld`
|
||||||
|
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
||||||
|
|
||||||
|
APP="$1"; URL_TYPE="$2"
|
||||||
|
case "$URL_TYPE" in
|
||||||
|
url)
|
||||||
|
echo "https://internal.tld/${APP}/"
|
||||||
|
;;
|
||||||
|
urls)
|
||||||
|
echo "https://internal.tld/${APP}/"
|
||||||
|
echo "http://internal.tld/${APP}/"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
```
|
||||||
|
|
||||||
### `check-deploy`
|
### `check-deploy`
|
||||||
|
|
||||||
- Description: Allows you to run checks on a deploy before Dokku allows the container to handle requests.
|
- Description: Allows you to run checks on a deploy before Dokku allows the container to handle requests.
|
||||||
|
|||||||
@@ -30,7 +30,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.12.2-2 (Mon Feb 22 23:20:37 CET 2016)"
|
# wait for "==> build-arch: ==> Finished making: dokku 0.12.8-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'
|
||||||
|
|||||||
@@ -21,8 +21,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.12.2/bootstrap.sh;
|
wget https://raw.githubusercontent.com/dokku/dokku/v0.12.8/bootstrap.sh;
|
||||||
sudo DOKKU_TAG=v0.12.2 bash bootstrap.sh
|
sudo DOKKU_TAG=v0.12.8 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.
|
||||||
|
|||||||
@@ -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.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-57x57.png">
|
<link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/apple-touch-icon-57x57.png">
|
||||||
<link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-60x60.png">
|
<link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/apple-touch-icon-60x60.png">
|
||||||
<link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-72x72.png">
|
<link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/apple-touch-icon-72x72.png">
|
||||||
<link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-76x76.png">
|
<link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/apple-touch-icon-76x76.png">
|
||||||
<link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-114x114.png">
|
<link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/apple-touch-icon-114x114.png">
|
||||||
<link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-120x120.png">
|
<link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/apple-touch-icon-120x120.png">
|
||||||
<link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-144x144.png">
|
<link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/apple-touch-icon-144x144.png">
|
||||||
<link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-152x152.png">
|
<link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/apple-touch-icon-152x152.png">
|
||||||
<link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-180x180.png">
|
<link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/apple-touch-icon-180x180.png">
|
||||||
<link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
|
<link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
|
||||||
<link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
|
<link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
|
||||||
<link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
|
<link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
|
||||||
<link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
|
<link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
|
||||||
<link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/manifest.json">
|
<link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/manifest.json">
|
||||||
<link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/favicon.ico">
|
<link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/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.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/mstile-144x144.png">
|
<meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/mstile-144x144.png">
|
||||||
<meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/browserconfig.xml">
|
<meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.12.8/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.rawgit.com/dokku/dokku/v0.12.2/docs/assets/style.css" rel="stylesheet">
|
<link href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/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>
|
||||||
@@ -98,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.12.2/bootstrap.sh</span>
|
<span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.12.8/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.12.2 bash bootstrap.sh</span>
|
<span class="command">sudo DOKKU_TAG=v0.12.8 bash bootstrap.sh</span>
|
||||||
</p>
|
</p>
|
||||||
<p class="line">
|
<p class="line">
|
||||||
<span class="output"> # go to your server's IP and follow the web installer</span>
|
<span class="output"> # go to your server's IP and follow the web installer</span>
|
||||||
@@ -140,7 +140,7 @@
|
|||||||
<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">echo "trusty utopic vivid wily xenial yakkety zesty artful bionic" | grep -q "$OS_ID" || OS_ID="trusty"</span>
|
<span class="command">echo "utopicvividwilyxenialyakketyzestyartfulbionic" | grep -q "$OS_ID" || OS_ID="trusty"</span>
|
||||||
</p>
|
</p>
|
||||||
<p class="line">
|
<p class="line">
|
||||||
<span class="path"></span>
|
<span class="path"></span>
|
||||||
|
|||||||
@@ -9,26 +9,26 @@
|
|||||||
<meta name="author" content="">
|
<meta name="author" content="">
|
||||||
<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.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-57x57.png">
|
<link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/apple-touch-icon-57x57.png">
|
||||||
<link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-60x60.png">
|
<link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/apple-touch-icon-60x60.png">
|
||||||
<link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-72x72.png">
|
<link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/apple-touch-icon-72x72.png">
|
||||||
<link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-76x76.png">
|
<link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/apple-touch-icon-76x76.png">
|
||||||
<link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-114x114.png">
|
<link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/apple-touch-icon-114x114.png">
|
||||||
<link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-120x120.png">
|
<link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/apple-touch-icon-120x120.png">
|
||||||
<link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-144x144.png">
|
<link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/apple-touch-icon-144x144.png">
|
||||||
<link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-152x152.png">
|
<link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/apple-touch-icon-152x152.png">
|
||||||
<link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/apple-touch-icon-180x180.png">
|
<link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/apple-touch-icon-180x180.png">
|
||||||
<link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
|
<link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
|
||||||
<link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
|
<link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
|
||||||
<link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
|
<link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
|
||||||
<link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
|
<link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
|
||||||
<link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/manifest.json">
|
<link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/manifest.json">
|
||||||
<link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/favicon.ico">
|
<link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/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.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/mstile-144x144.png">
|
<meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/mstile-144x144.png">
|
||||||
<meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.12.2/docs/assets/favicons/browserconfig.xml">
|
<meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.12.8/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.rawgit.com/dokku/dokku/v0.12.2/docs/assets/style.css" rel="stylesheet">
|
<link href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/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>
|
||||||
@@ -174,6 +174,7 @@
|
|||||||
<a href="/{{NAME}}/community/plugins/" class="list-group-item">Plugins</a>
|
<a href="/{{NAME}}/community/plugins/" class="list-group-item">Plugins</a>
|
||||||
|
|
||||||
<a href="#" class="list-group-item disabled">Community Tutorials</a>
|
<a href="#" class="list-group-item disabled">Community Tutorials</a>
|
||||||
|
<a href="/{{NAME}}/community/tutorials/deploying-with-gitlab-ci/" class="list-group-item">Deploying with Gitlab CI</a>
|
||||||
<a href="/{{NAME}}/community/tutorials/run-on-external-volume/" class="list-group-item">Run on External Volume</a>
|
<a href="/{{NAME}}/community/tutorials/run-on-external-volume/" class="list-group-item">Run on External Volume</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
25
dokku
25
dokku
@@ -27,6 +27,7 @@ if [[ -d $DOKKU_ROOT/.dokkurc ]]; then
|
|||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
[[ $DOKKU_TRACE ]] && set -x
|
[[ $DOKKU_TRACE ]] && set -x
|
||||||
|
export DOKKU_HOST_ROOT=${DOKKU_HOST_ROOT:=$DOKKU_ROOT}
|
||||||
|
|
||||||
export DOKKU_DISTRO
|
export DOKKU_DISTRO
|
||||||
# shellcheck disable=SC1091
|
# shellcheck disable=SC1091
|
||||||
@@ -190,20 +191,20 @@ case "$1" in
|
|||||||
done
|
done
|
||||||
|
|
||||||
# New lines are blank echos for readability
|
# New lines are blank echos for readability
|
||||||
echo "Usage: dokku [--quiet|--trace|--rm-container|--rm|--force] COMMAND <app> [command-specific-options]"
|
dokku_log_quiet "Usage: dokku [--quiet|--trace|--rm-container|--rm|--force] COMMAND <app> [command-specific-options]"
|
||||||
echo ""
|
dokku_log_quiet ""
|
||||||
echo "Primary help options, type \"dokku COMMAND:help\" for more details, or dokku help --all to see all commands."
|
dokku_log_quiet "Primary help options, type \"dokku COMMAND:help\" for more details, or dokku help --all to see all commands."
|
||||||
echo ""
|
dokku_log_quiet ""
|
||||||
echo "Commands:"
|
dokku_log_quiet "Commands:"
|
||||||
echo ""
|
dokku_log_quiet ""
|
||||||
|
|
||||||
if [[ "$2" == "--all" ]] ; then
|
if [[ "$2" == "--all" ]] ; then
|
||||||
for core_plugin_command in $CORE_PLUGIN_COMMANDS; do
|
for core_plugin_command in $CORE_PLUGIN_COMMANDS; do
|
||||||
$core_plugin_command help
|
$core_plugin_command help
|
||||||
done | sort | column -c2 -t -s,
|
done | sort | column -c2 -t -s,
|
||||||
echo ""
|
dokku_log_quiet ""
|
||||||
echo "Community plugin commands:"
|
dokku_log_quiet "Community plugin commands:"
|
||||||
echo ""
|
dokku_log_quiet ""
|
||||||
for community_plugin_command in $COMMUNITY_PLUGIN_COMMANDS; do
|
for community_plugin_command in $COMMUNITY_PLUGIN_COMMANDS; do
|
||||||
$community_plugin_command help
|
$community_plugin_command help
|
||||||
done | sort | column -c2 -t -s,
|
done | sort | column -c2 -t -s,
|
||||||
@@ -213,9 +214,9 @@ case "$1" in
|
|||||||
# When done, sort, sed cuts arugments out of strings and colum make it pretty
|
# When done, sort, sed cuts arugments out of strings and colum make it pretty
|
||||||
done | sort | sed -e '/^.*:/d' -e 's/\s[\[\<\-\(].*,/,/' | column -c2 -t -s,
|
done | sort | sed -e '/^.*:/d' -e 's/\s[\[\<\-\(].*,/,/' | column -c2 -t -s,
|
||||||
if [[ -n "$COMMUNITY_PLUGIN_COMMANDS" ]]; then
|
if [[ -n "$COMMUNITY_PLUGIN_COMMANDS" ]]; then
|
||||||
echo ""
|
dokku_log_quiet ""
|
||||||
echo "Community plugin commands:"
|
dokku_log_quiet "Community plugin commands:"
|
||||||
echo ""
|
dokku_log_quiet ""
|
||||||
for community_plugin_command in $COMMUNITY_PLUGIN_COMMANDS; do
|
for community_plugin_command in $COMMUNITY_PLUGIN_COMMANDS; do
|
||||||
$community_plugin_command help
|
$community_plugin_command help
|
||||||
done | sort | column -c2 -t -s,
|
done | sort | column -c2 -t -s,
|
||||||
|
|||||||
@@ -1,14 +1,13 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
[[ " help help:help ls:help run:help trace:help url:help urls:help version:help " == *" $1 "* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
|
[[ " help help:help run:help trace:help url:help urls:help version:help " == *" $1 "* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
|
||||||
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
help|ls:help|run:help|trace:help|url:help|urls:help|version:help)
|
help|run:help|trace:help|url:help|urls:help|version:help)
|
||||||
[[ $(echo "$1" | sed '/.*:help/!d') ]] && help_topic="${1%\:help}"
|
[[ $(echo "$1" | sed '/.*:help/!d') ]] && help_topic="${1%\:help}"
|
||||||
help_content_func () {
|
help_content_func () {
|
||||||
declare desc="return standard plugin help content"
|
declare desc="return standard plugin help content"
|
||||||
cat<<help_content
|
cat<<help_content
|
||||||
ls , Pretty listing of deployed applications and containers
|
|
||||||
run <app> <cmd>, Run a command in a new container using the current application image
|
run <app> <cmd>, Run a command in a new container using the current application image
|
||||||
trace [on/off], Enable dokku tracing
|
trace [on/off], Enable dokku tracing
|
||||||
url <app>, Show the first URL for an application (compatibility)
|
url <app>, Show the first URL for an application (compatibility)
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ execute_script() {
|
|||||||
COMMAND+=" fi "
|
COMMAND+=" fi "
|
||||||
|
|
||||||
local CACHE_DIR="$DOKKU_ROOT/$APP/cache"
|
local CACHE_DIR="$DOKKU_ROOT/$APP/cache"
|
||||||
|
local CACHE_HOST_DIR="$DOKKU_HOST_ROOT/$APP/cache"
|
||||||
[[ -d $CACHE_DIR ]] || mkdir -p "$CACHE_DIR"
|
[[ -d $CACHE_DIR ]] || mkdir -p "$CACHE_DIR"
|
||||||
|
|
||||||
local DOCKER_ARGS=$(: | plugn trigger docker-args-deploy "$APP" "$IMAGE_TAG")
|
local DOCKER_ARGS=$(: | plugn trigger docker-args-deploy "$APP" "$IMAGE_TAG")
|
||||||
@@ -66,7 +67,7 @@ execute_script() {
|
|||||||
DOKKU_APP_SHELL="$(config_get "$APP" DOKKU_APP_SHELL || echo "$DOKKU_APP_SHELL")"
|
DOKKU_APP_SHELL="$(config_get "$APP" DOKKU_APP_SHELL || echo "$DOKKU_APP_SHELL")"
|
||||||
[[ -z "$DOKKU_APP_SHELL" ]] && DOKKU_APP_SHELL="/bin/bash"
|
[[ -z "$DOKKU_APP_SHELL" ]] && DOKKU_APP_SHELL="/bin/bash"
|
||||||
|
|
||||||
id=$(docker run "$DOKKU_GLOBAL_RUN_ARGS" -e DOKKU_TRACE="$DOKKU_TRACE" --label=dokku_phase_script="${PHASE_SCRIPT_KEY}" -d -v "$CACHE_DIR:/cache" "${ARG_ARRAY[@]}" "$IMAGE" "$DOKKU_APP_SHELL" -c "$COMMAND")
|
id=$(docker run "$DOKKU_GLOBAL_RUN_ARGS" -e DOKKU_TRACE="$DOKKU_TRACE" --label=dokku_phase_script="${PHASE_SCRIPT_KEY}" -d -v "$CACHE_HOST_DIR:/cache" "${ARG_ARRAY[@]}" "$IMAGE" "$DOKKU_APP_SHELL" -c "$COMMAND")
|
||||||
if test "$(docker wait "$id")" -eq 0; then
|
if test "$(docker wait "$id")" -eq 0; then
|
||||||
dokku_container_log_verbose_quiet "$id"
|
dokku_container_log_verbose_quiet "$id"
|
||||||
if [[ "$PHASE_SCRIPT_KEY" != "postdeploy" ]];then
|
if [[ "$PHASE_SCRIPT_KEY" != "postdeploy" ]];then
|
||||||
|
|||||||
@@ -39,10 +39,10 @@ User=dokku
|
|||||||
ExecStart=$dokku_path ps:restore
|
ExecStart=$dokku_path ps:restore
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=docker.service
|
||||||
EOF
|
EOF
|
||||||
if command -v systemctl &>/dev/null; then
|
if command -v systemctl &>/dev/null; then
|
||||||
systemctl enable dokku-redeploy
|
systemctl reenable dokku-redeploy
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[plugin]
|
[plugin]
|
||||||
description = "dokku core standard plugin"
|
description = "dokku core standard plugin"
|
||||||
version = "0.12.2"
|
version = "0.12.8"
|
||||||
[plugin.config]
|
[plugin.config]
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[plugin]
|
[plugin]
|
||||||
description = "dokku core events logging plugin"
|
description = "dokku core events logging plugin"
|
||||||
version = "0.12.2"
|
version = "0.12.8"
|
||||||
[plugin.config]
|
[plugin.config]
|
||||||
|
|||||||
@@ -16,8 +16,10 @@ apps_create() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
apps_destroy() {
|
apps_destroy() {
|
||||||
local APP="$1"; local IMAGE_TAG=$(get_running_image_tag "$APP")
|
declare desc="destroys an app"
|
||||||
|
declare APP="$1";
|
||||||
verify_app_name "$APP"
|
verify_app_name "$APP"
|
||||||
|
local IMAGE_TAG=$(get_running_image_tag "$APP")
|
||||||
|
|
||||||
if [[ -z "$DOKKU_APPS_FORCE_DELETE" ]]; then
|
if [[ -z "$DOKKU_APPS_FORCE_DELETE" ]]; then
|
||||||
dokku_log_warn "WARNING: Potentially Destructive Action"
|
dokku_log_warn "WARNING: Potentially Destructive Action"
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[plugin]
|
[plugin]
|
||||||
description = "dokku core apps plugin"
|
description = "dokku core apps plugin"
|
||||||
version = "0.12.2"
|
version = "0.12.8"
|
||||||
[plugin.config]
|
[plugin.config]
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
|||||||
apps_pre_delete() {
|
apps_pre_delete() {
|
||||||
declare desc="apps pre-delete plugin trigger"
|
declare desc="apps pre-delete plugin trigger"
|
||||||
local trigger="apps_pre_delete"
|
local trigger="apps_pre_delete"
|
||||||
local APP="$1"; local IMAGE_TAG="$2"; local IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG"); local CACHE_DIR="$DOKKU_ROOT/$APP/cache"
|
local APP="$1"; local IMAGE_TAG="$2"; local IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG"); local CACHE_DIR="$DOKKU_ROOT/$APP/cache"; local CACHE_HOST_DIR="$DOKKU_HOST_ROOT/$APP/cache"
|
||||||
verify_app_name "$APP"
|
verify_app_name "$APP"
|
||||||
|
|
||||||
if ! is_image_herokuish_based "$IMAGE"; then
|
if ! is_image_herokuish_based "$IMAGE"; then
|
||||||
@@ -13,7 +13,7 @@ apps_pre_delete() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -d $CACHE_DIR ]]; then
|
if [[ -d $CACHE_DIR ]]; then
|
||||||
docker run "$DOKKU_GLOBAL_RUN_ARGS" --rm -v "$CACHE_DIR:/cache" "$IMAGE" find /cache -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \; || true
|
docker run "$DOKKU_GLOBAL_RUN_ARGS" --rm -v "$CACHE_HOST_DIR:/cache" "$IMAGE" find /cache -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \; || true
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,19 +6,34 @@ source "$PLUGIN_AVAILABLE_PATH/ps/functions"
|
|||||||
|
|
||||||
apps_clone_cmd() {
|
apps_clone_cmd() {
|
||||||
declare desc="clones an app"
|
declare desc="clones an app"
|
||||||
declare OLD_APP="$2" NEW_APP="$3"
|
declare cmd="apps:clone" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
|
||||||
local cmd="apps:clone"
|
declare OLD_APP="$1" NEW_APP="$2"
|
||||||
|
local IGNORE_EXISTING=false
|
||||||
local SKIP_REBUILD=false
|
local SKIP_REBUILD=false
|
||||||
|
|
||||||
if [[ "$2" == "--skip-deploy" ]]; then
|
for arg in "$@"; do
|
||||||
SKIP_REBUILD=true
|
[[ "$arg" == "--skip-deploy" ]] && shift 1 && SKIP_REBUILD=true
|
||||||
OLD_APP="$3"
|
[[ "$arg" == "--ignore-existing" ]] && shift 1 && IGNORE_EXISTING=true
|
||||||
NEW_APP="$4"
|
[[ "$arg" =~ ^--.* ]] || break
|
||||||
|
done
|
||||||
|
|
||||||
|
OLD_APP="$1" NEW_APP="$2"
|
||||||
|
[[ -z "$OLD_APP" ]] && dokku_log_fail "Please specify an app to run the command on"
|
||||||
|
|
||||||
|
is_valid_app_name "$OLD_APP"
|
||||||
|
is_valid_app_name "$NEW_APP"
|
||||||
|
apps_exists "$OLD_APP" > /dev/null 2>&1 || dokku_log_fail "App does not exist"
|
||||||
|
if apps_exists "$NEW_APP" > /dev/null 2>&1; then
|
||||||
|
if [[ "$IGNORE_EXISTING" == true ]]; then
|
||||||
|
dokku_log_warn "Name is already taken"
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
dokku_log_fail "Name is already taken"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[[ -z "$OLD_APP" ]] && dokku_log_fail "Please specify an app to run the command on"
|
|
||||||
[[ -d "$DOKKU_ROOT/$NEW_APP" ]] && dokku_log_fail "Name is already taken"
|
|
||||||
local NEW_CACHE_DIR="$DOKKU_ROOT/$NEW_APP/cache"
|
local NEW_CACHE_DIR="$DOKKU_ROOT/$NEW_APP/cache"
|
||||||
|
local NEW_CACHE_HOST_DIR="$DOKKU_HOST_ROOT/$NEW_APP/cache"
|
||||||
|
|
||||||
apps_create "$NEW_APP"
|
apps_create "$NEW_APP"
|
||||||
pushd "$DOKKU_ROOT/$OLD_APP/." > /dev/null
|
pushd "$DOKKU_ROOT/$OLD_APP/." > /dev/null
|
||||||
@@ -26,7 +41,7 @@ apps_clone_cmd() {
|
|||||||
popd > /dev/null 2>&1 || pushd "/tmp" > /dev/null
|
popd > /dev/null 2>&1 || pushd "/tmp" > /dev/null
|
||||||
|
|
||||||
if [[ -d "$NEW_CACHE_DIR" ]] && ! rmdir "$NEW_CACHE_DIR"; then
|
if [[ -d "$NEW_CACHE_DIR" ]] && ! rmdir "$NEW_CACHE_DIR"; then
|
||||||
docker run "$DOKKU_GLOBAL_RUN_ARGS" --rm -v "$NEW_CACHE_DIR:/cache" "dokku/$OLD_APP" chmod 777 -R /cache
|
docker run "$DOKKU_GLOBAL_RUN_ARGS" --rm -v "$NEW_CACHE_HOST_DIR:/cache" "dokku/$OLD_APP" chmod 777 -R /cache
|
||||||
fi
|
fi
|
||||||
rm -rf "$NEW_CACHE_DIR"
|
rm -rf "$NEW_CACHE_DIR"
|
||||||
|
|
||||||
|
|||||||
@@ -12,9 +12,10 @@ apps_rename_cmd() {
|
|||||||
local OLD_APP="$2"
|
local OLD_APP="$2"
|
||||||
local NEW_APP="$3"
|
local NEW_APP="$3"
|
||||||
local OLD_CACHE_DIR="$DOKKU_ROOT/$OLD_APP/cache"
|
local OLD_CACHE_DIR="$DOKKU_ROOT/$OLD_APP/cache"
|
||||||
|
local OLD_CACHE_HOST_DIR="$DOKKU_HOST_ROOT/$OLD_APP/cache"
|
||||||
|
|
||||||
if [[ -d "$OLD_CACHE_DIR" ]] && ! rmdir "$OLD_CACHE_DIR"; then
|
if [[ -d "$OLD_CACHE_DIR" ]] && ! rmdir "$OLD_CACHE_DIR"; then
|
||||||
docker run "$DOKKU_GLOBAL_RUN_ARGS" --rm -v "$OLD_CACHE_DIR:/cache" "dokku/$OLD_APP" chmod 777 -R /cache
|
docker run "$DOKKU_GLOBAL_RUN_ARGS" --rm -v "$OLD_CACHE_HOST_DIR:/cache" "dokku/$OLD_APP" chmod 777 -R /cache
|
||||||
fi
|
fi
|
||||||
rm -rf "$OLD_CACHE_DIR"
|
rm -rf "$OLD_CACHE_DIR"
|
||||||
apps_create "$NEW_APP"
|
apps_create "$NEW_APP"
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[plugin]
|
[plugin]
|
||||||
description = "dokku core build-env plugin"
|
description = "dokku core build-env plugin"
|
||||||
version = "0.12.2"
|
version = "0.12.8"
|
||||||
[plugin.config]
|
[plugin.config]
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[plugin]
|
[plugin]
|
||||||
description = "dokku core certificate management plugin"
|
description = "dokku core certificate management plugin"
|
||||||
version = "0.12.2"
|
version = "0.12.8"
|
||||||
[plugin.config]
|
[plugin.config]
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[plugin]
|
[plugin]
|
||||||
description = "dokku core checks plugin"
|
description = "dokku core checks plugin"
|
||||||
version = "0.12.2"
|
version = "0.12.8"
|
||||||
[plugin.config]
|
[plugin.config]
|
||||||
|
|||||||
@@ -16,6 +16,13 @@ dokku_apps() {
|
|||||||
[[ $INSTALLED_APPS ]] && echo "$INSTALLED_APPS"
|
[[ $INSTALLED_APPS ]] && echo "$INSTALLED_APPS"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dokku_log_quiet() {
|
||||||
|
declare desc="log quiet formatter"
|
||||||
|
if [[ -z "$DOKKU_QUIET_OUTPUT" ]]; then
|
||||||
|
echo "$*"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
dokku_log_info1() {
|
dokku_log_info1() {
|
||||||
declare desc="log info1 formatter"
|
declare desc="log info1 formatter"
|
||||||
echo "-----> $*"
|
echo "-----> $*"
|
||||||
@@ -401,14 +408,17 @@ is_deployed() {
|
|||||||
is_container_running() {
|
is_container_running() {
|
||||||
declare desc="return 0 if given docker container id is in running state"
|
declare desc="return 0 if given docker container id is in running state"
|
||||||
declare deprecated=true
|
declare deprecated=true
|
||||||
local CID=$1
|
declare CID="$1"
|
||||||
local CONTAINER_STATUS=$(docker inspect -f '{{.State.Running}}' "$CID" || true)
|
local CONTAINER_STATUS
|
||||||
|
|
||||||
|
dokku_log_warn "Deprecated: common#is_container_status"
|
||||||
|
CONTAINER_STATUS=$(docker inspect -f '{{.State.Running}}' "$CID" || true)
|
||||||
|
|
||||||
if [[ "$CONTAINER_STATUS" == "true" ]]; then
|
if [[ "$CONTAINER_STATUS" == "true" ]]; then
|
||||||
return 0
|
return 0
|
||||||
else
|
|
||||||
return 1
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
is_container_status() {
|
is_container_status() {
|
||||||
@@ -419,14 +429,17 @@ is_container_status() {
|
|||||||
|
|
||||||
if [[ "$CONTAINER_STATUS" == "true" ]]; then
|
if [[ "$CONTAINER_STATUS" == "true" ]]; then
|
||||||
return 0
|
return 0
|
||||||
else
|
|
||||||
return 1
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
is_app_running() {
|
is_app_running() {
|
||||||
declare desc="return 0 if given app has a running container"
|
declare desc="return 0 if given app has a running container"
|
||||||
|
declare deprecated=true
|
||||||
local APP="$1"
|
local APP="$1"
|
||||||
|
|
||||||
|
dokku_log_warn "Deprecated: ps#fn-is-app-running"
|
||||||
verify_app_name "$APP"
|
verify_app_name "$APP"
|
||||||
|
|
||||||
local APP_RUNNING_CONTAINER_IDS=$(get_app_running_container_ids "$APP")
|
local APP_RUNNING_CONTAINER_IDS=$(get_app_running_container_ids "$APP")
|
||||||
@@ -447,6 +460,7 @@ dokku_build() {
|
|||||||
verify_app_name "$APP"
|
verify_app_name "$APP"
|
||||||
|
|
||||||
local DOKKU_APP_CACHE_DIR="$DOKKU_ROOT/$APP/cache"
|
local DOKKU_APP_CACHE_DIR="$DOKKU_ROOT/$APP/cache"
|
||||||
|
local DOKKU_APP_HOST_CACHE_DIR="$DOKKU_HOST_ROOT/$APP/cache"
|
||||||
|
|
||||||
eval "$(config_export app "$APP")"
|
eval "$(config_export app "$APP")"
|
||||||
pushd "$TMP_WORK_DIR" &> /dev/null
|
pushd "$TMP_WORK_DIR" &> /dev/null
|
||||||
@@ -465,7 +479,7 @@ dokku_build() {
|
|||||||
declare -a ARG_ARRAY
|
declare -a ARG_ARRAY
|
||||||
eval "ARG_ARRAY=($DOCKER_ARGS)"
|
eval "ARG_ARRAY=($DOCKER_ARGS)"
|
||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
cid=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d -v $DOKKU_APP_CACHE_DIR:/cache -e CACHE_PATH=/cache "${ARG_ARRAY[@]}" $IMAGE /build)
|
cid=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d -v $DOKKU_APP_HOST_CACHE_DIR:/cache -e CACHE_PATH=/cache "${ARG_ARRAY[@]}" $IMAGE /build)
|
||||||
docker attach "$cid"
|
docker attach "$cid"
|
||||||
test "$(docker wait "$cid")" -eq 0
|
test "$(docker wait "$cid")" -eq 0
|
||||||
docker commit "$cid" "$IMAGE" > /dev/null
|
docker commit "$cid" "$IMAGE" > /dev/null
|
||||||
@@ -543,6 +557,7 @@ dokku_release() {
|
|||||||
dokku_deploy_cmd() {
|
dokku_deploy_cmd() {
|
||||||
declare desc="deploy phase"
|
declare desc="deploy phase"
|
||||||
declare APP="$1" IMAGE_TAG="$2"
|
declare APP="$1" IMAGE_TAG="$2"
|
||||||
|
source "$PLUGIN_AVAILABLE_PATH/config/functions"
|
||||||
|
|
||||||
local DOKKU_SCHEDULER=$(config_get "$APP" DOKKU_SCHEDULER || echo "docker-local")
|
local DOKKU_SCHEDULER=$(config_get "$APP" DOKKU_SCHEDULER || echo "docker-local")
|
||||||
plugn trigger scheduler-deploy "$DOKKU_SCHEDULER" "$APP" "$IMAGE_TAG"
|
plugn trigger scheduler-deploy "$DOKKU_SCHEDULER" "$APP" "$IMAGE_TAG"
|
||||||
@@ -763,13 +778,27 @@ get_container_ports() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
get_app_urls() {
|
get_app_urls() {
|
||||||
|
declare desc="print an app's available urls"
|
||||||
|
declare URL_TYPE="$1" APP="$2"
|
||||||
|
local urls
|
||||||
|
|
||||||
|
verify_app_name "$APP"
|
||||||
|
urls=$(plugn trigger app-urls "$APP" "$URL_TYPE")
|
||||||
|
if [[ -n "$urls" ]]; then
|
||||||
|
echo "$urls" | sort
|
||||||
|
else
|
||||||
|
internal_get_app_urls "$URL_TYPE" "$APP"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
internal_get_app_urls() {
|
||||||
declare desc="print an app's available urls"
|
declare desc="print an app's available urls"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/certs/functions"
|
source "$PLUGIN_AVAILABLE_PATH/certs/functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/config/functions"
|
source "$PLUGIN_AVAILABLE_PATH/config/functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/domains/functions"
|
source "$PLUGIN_AVAILABLE_PATH/domains/functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
|
source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
|
||||||
|
|
||||||
local APP="$2"; verify_app_name "$APP"
|
local APP="$2"
|
||||||
local RAW_TCP_PORTS="$(get_app_raw_tcp_ports "$APP")"
|
local RAW_TCP_PORTS="$(get_app_raw_tcp_ports "$APP")"
|
||||||
local URLS_FILE="$DOKKU_ROOT/$APP/URLS"
|
local URLS_FILE="$DOKKU_ROOT/$APP/URLS"
|
||||||
local DOKKU_PROXY_PORT_MAP=$(config_get "$APP" DOKKU_PROXY_PORT_MAP || true)
|
local DOKKU_PROXY_PORT_MAP=$(config_get "$APP" DOKKU_PROXY_PORT_MAP || true)
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[plugin]
|
[plugin]
|
||||||
description = "dokku core common plugin"
|
description = "dokku core common plugin"
|
||||||
version = "0.12.2"
|
version = "0.12.8"
|
||||||
[plugin.config]
|
[plugin.config]
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[plugin]
|
[plugin]
|
||||||
description = "dokku core config plugin"
|
description = "dokku core config plugin"
|
||||||
version = "0.12.2"
|
version = "0.12.8"
|
||||||
[plugin.config]
|
[plugin.config]
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ Additional commands:`
|
|||||||
config (<app>|--global), Pretty-print an app or global environment
|
config (<app>|--global), Pretty-print an app or global environment
|
||||||
config:get (<app>|--global) KEY, Display a global or app-specific config value
|
config:get (<app>|--global) KEY, Display a global or app-specific config value
|
||||||
config:set [--encoded] [--no-restart] (<app>|--global) KEY1=VALUE1 [KEY2=VALUE2 ...], Set one or more config vars
|
config:set [--encoded] [--no-restart] (<app>|--global) KEY1=VALUE1 [KEY2=VALUE2 ...], Set one or more config vars
|
||||||
config:unset (<app>|--global) KEY1 [KEY2 ...], Unset one or more config vars
|
config:unset [--no-restart] (<app>|--global) KEY1 [KEY2 ...], Unset one or more config vars
|
||||||
config:export (<app>|--global) [--envfile], Export a global or app environment
|
config:export (<app>|--global) [--envfile], Export a global or app environment
|
||||||
config:keys (<app>|--global) [--merged], Show keys set in environment
|
config:keys (<app>|--global) [--merged], Show keys set in environment
|
||||||
config:bundle (<app>|--global) [--merged], Bundle environment into tarfile
|
config:bundle (<app>|--global) [--merged], Bundle environment into tarfile
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[plugin]
|
[plugin]
|
||||||
description = "dokku core docker-options plugin"
|
description = "dokku core docker-options plugin"
|
||||||
version = "0.12.2"
|
version = "0.12.8"
|
||||||
[plugin.config]
|
[plugin.config]
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[plugin]
|
[plugin]
|
||||||
description = "dokku core domains plugin"
|
description = "dokku core domains plugin"
|
||||||
version = "0.12.2"
|
version = "0.12.8"
|
||||||
[plugin.config]
|
[plugin.config]
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[plugin]
|
[plugin]
|
||||||
description = "dokku core enter plugin"
|
description = "dokku core enter plugin"
|
||||||
version = "0.12.2"
|
version = "0.12.8"
|
||||||
[plugin.config]
|
[plugin.config]
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ git_build_app_repo() {
|
|||||||
# unset the git quarantine path to allow us to use 2.13.0+
|
# unset the git quarantine path to allow us to use 2.13.0+
|
||||||
# See this issue for more information: https://github.com/dokku/dokku/issues/2796
|
# See this issue for more information: https://github.com/dokku/dokku/issues/2796
|
||||||
env -u GIT_QUARANTINE_PATH git worktree add "$GIT_BUILD_APP_REPO_TMP_WORK_DIR" "$REV" > /dev/null
|
env -u GIT_QUARANTINE_PATH git worktree add "$GIT_BUILD_APP_REPO_TMP_WORK_DIR" "$REV" > /dev/null
|
||||||
popd > /dev/null
|
popd > /dev/null 2>&1 || pushd "/tmp" > /dev/null
|
||||||
pushd "$GIT_BUILD_APP_REPO_TMP_WORK_DIR" > /dev/null
|
pushd "$GIT_BUILD_APP_REPO_TMP_WORK_DIR" > /dev/null
|
||||||
else
|
else
|
||||||
# git clone - this method creates a new git repository and adds the primary
|
# git clone - this method creates a new git repository and adds the primary
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ migrate_git_vars_0_12_0() {
|
|||||||
for app in $APPS; do
|
for app in $APPS; do
|
||||||
DOKKU_DEPLOY_BRANCH=$(config_get "$app" DOKKU_DEPLOY_BRANCH || true)
|
DOKKU_DEPLOY_BRANCH=$(config_get "$app" DOKKU_DEPLOY_BRANCH || true)
|
||||||
if [[ -n "$DOKKU_DEPLOY_BRANCH" ]]; then
|
if [[ -n "$DOKKU_DEPLOY_BRANCH" ]]; then
|
||||||
fn-plugin-property-write "git" "$APP" "deploy-branch" "$DOKKU_DEPLOY_BRANCH"
|
fn-plugin-property-write "git" "$app" "deploy-branch" "$DOKKU_DEPLOY_BRANCH"
|
||||||
config_unset --no-restart "$app" DOKKU_DEPLOY_BRANCH || true
|
config_unset --no-restart "$app" DOKKU_DEPLOY_BRANCH || true
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[plugin]
|
[plugin]
|
||||||
description = "dokku core git plugin"
|
description = "dokku core git plugin"
|
||||||
version = "0.12.2"
|
version = "0.12.8"
|
||||||
[plugin.config]
|
[plugin.config]
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[plugin]
|
[plugin]
|
||||||
description = "dokku core logs plugin"
|
description = "dokku core logs plugin"
|
||||||
version = "0.12.2"
|
version = "0.12.8"
|
||||||
[plugin.config]
|
[plugin.config]
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[plugin]
|
[plugin]
|
||||||
description = "dokku core network plugin"
|
description = "dokku core network plugin"
|
||||||
version = "0.12.2"
|
version = "0.12.8"
|
||||||
[plugin.config]
|
[plugin.config]
|
||||||
|
|||||||
@@ -191,6 +191,28 @@ is_spdy_enabled() {
|
|||||||
echo $HAS_SUPPORT
|
echo $HAS_SUPPORT
|
||||||
}
|
}
|
||||||
|
|
||||||
|
is_http2_push_enabled() {
|
||||||
|
declare desc="detects whether the installed nginx version has http2 push support"
|
||||||
|
local NGINX_VERSION="$1"
|
||||||
|
local MAJOR_VERSION MINOR_VERSION PATCH_VERSION
|
||||||
|
local HAS_SUPPORT=false
|
||||||
|
|
||||||
|
MAJOR_VERSION=$(echo "$NGINX_VERSION" | awk '{split($0,a,"."); print a[1]}')
|
||||||
|
MINOR_VERSION=$(echo "$NGINX_VERSION" | awk '{split($0,a,"."); print a[2]}')
|
||||||
|
PATCH_VERSION=$(echo "$NGINX_VERSION" | awk '{split($0,a,"."); print a[3]}')
|
||||||
|
if [[ "$MAJOR_VERSION" -ge "2" ]]; then
|
||||||
|
HAS_SUPPORT=true
|
||||||
|
elif [[ "$MAJOR_VERSION" -eq "1" ]]; then
|
||||||
|
if [[ "$MINOR_VERSION" -eq "13" ]] && [[ "$PATCH_VERSION" -ge "9" ]]; then
|
||||||
|
HAS_SUPPORT=true
|
||||||
|
elif [[ "$MINOR_VERSION" -ge "14" ]]; then
|
||||||
|
HAS_SUPPORT=true
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo $HAS_SUPPORT
|
||||||
|
}
|
||||||
|
|
||||||
is_http2_enabled() {
|
is_http2_enabled() {
|
||||||
declare desc="detects whether the installed nginx version has http2 support"
|
declare desc="detects whether the installed nginx version has http2 support"
|
||||||
local NGINX_VERSION="$1"
|
local NGINX_VERSION="$1"
|
||||||
@@ -285,7 +307,7 @@ nginx_build_config() {
|
|||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
local NGINX_LOCATION NGINX_VERSION SPDY_SUPPORTED HTTP2_SUPPORTED
|
local NGINX_LOCATION NGINX_VERSION SPDY_SUPPORTED HTTP2_SUPPORTED HTTP2_PUSH_SUPPORTED
|
||||||
NGINX_LOCATION=$(get_nginx_location)
|
NGINX_LOCATION=$(get_nginx_location)
|
||||||
if [[ -z "$NGINX_LOCATION" ]]; then
|
if [[ -z "$NGINX_LOCATION" ]]; then
|
||||||
exit 1;
|
exit 1;
|
||||||
@@ -293,6 +315,7 @@ nginx_build_config() {
|
|||||||
NGINX_VERSION="$("$NGINX_LOCATION" -v 2>&1 | cut -d'/' -f 2)"
|
NGINX_VERSION="$("$NGINX_LOCATION" -v 2>&1 | cut -d'/' -f 2)"
|
||||||
SPDY_SUPPORTED="$(is_spdy_enabled "$NGINX_VERSION")"
|
SPDY_SUPPORTED="$(is_spdy_enabled "$NGINX_VERSION")"
|
||||||
HTTP2_SUPPORTED="$(is_http2_enabled "$NGINX_VERSION")"
|
HTTP2_SUPPORTED="$(is_http2_enabled "$NGINX_VERSION")"
|
||||||
|
HTTP2_PUSH_SUPPORTED="$(is_http2_push_enabled "$NGINX_VERSION")"
|
||||||
|
|
||||||
PROXY_PORT_MAP=$(echo "$PROXY_PORT_MAP" | xargs) # trailing spaces mess up default template
|
PROXY_PORT_MAP=$(echo "$PROXY_PORT_MAP" | xargs) # trailing spaces mess up default template
|
||||||
|
|
||||||
@@ -304,6 +327,7 @@ nginx_build_config() {
|
|||||||
PASSED_LISTEN_IP_PORT="$PASSED_LISTEN_IP_PORT"
|
PASSED_LISTEN_IP_PORT="$PASSED_LISTEN_IP_PORT"
|
||||||
SPDY_SUPPORTED="$SPDY_SUPPORTED"
|
SPDY_SUPPORTED="$SPDY_SUPPORTED"
|
||||||
HTTP2_SUPPORTED="$HTTP2_SUPPORTED"
|
HTTP2_SUPPORTED="$HTTP2_SUPPORTED"
|
||||||
|
HTTP2_PUSH_SUPPORTED="$HTTP2_PUSH_SUPPORTED"
|
||||||
DOKKU_APP_LISTEN_PORT="$DOKKU_APP_LISTEN_PORT" DOKKU_APP_LISTEN_IP="$DOKKU_APP_LISTEN_IP"
|
DOKKU_APP_LISTEN_PORT="$DOKKU_APP_LISTEN_PORT" DOKKU_APP_LISTEN_IP="$DOKKU_APP_LISTEN_IP"
|
||||||
APP_SSL_PATH="$APP_SSL_PATH" SSL_INUSE="$SSL_INUSE" SSL_SERVER_NAME="$SSL_SERVER_NAME"
|
APP_SSL_PATH="$APP_SSL_PATH" SSL_INUSE="$SSL_INUSE" SSL_SERVER_NAME="$SSL_SERVER_NAME"
|
||||||
# @TODO: Remove this after a few versions
|
# @TODO: Remove this after a few versions
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[plugin]
|
[plugin]
|
||||||
description = "dokku core nginx-vhosts plugin"
|
description = "dokku core nginx-vhosts plugin"
|
||||||
version = "0.12.2"
|
version = "0.12.8"
|
||||||
[plugin.config]
|
[plugin.config]
|
||||||
|
|||||||
@@ -81,6 +81,7 @@ server {
|
|||||||
gzip_comp_level 6;
|
gzip_comp_level 6;
|
||||||
|
|
||||||
proxy_pass http://{{ $.APP }}-{{ $upstream_port }};
|
proxy_pass http://{{ $.APP }}-{{ $upstream_port }};
|
||||||
|
{{ if eq $.HTTP2_PUSH_SUPPORTED "true" }}http2_push_preload on; {{ end }}
|
||||||
proxy_http_version 1.1;
|
proxy_http_version 1.1;
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
proxy_set_header Connection "upgrade";
|
proxy_set_header Connection "upgrade";
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
||||||
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
|
|
||||||
plugin_list_cmd() {
|
plugin_list_cmd() {
|
||||||
declare desc="lists all plugins"
|
declare desc="lists all plugins"
|
||||||
@@ -8,3 +9,10 @@ plugin_list_cmd() {
|
|||||||
plugn version
|
plugn version
|
||||||
plugn list
|
plugn list
|
||||||
}
|
}
|
||||||
|
|
||||||
|
plugin_prime_bash_completion() {
|
||||||
|
declare desc="primes the bash-completion cache"
|
||||||
|
|
||||||
|
dokku_log_info1_quiet "Priming bash-completion cache"
|
||||||
|
dokku --quiet help --all | awk '/^ /{ print $1 }' | sort > "/var/cache/dokku-completion"
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[plugin]
|
[plugin]
|
||||||
description = "dokku core plugin plugin"
|
description = "dokku core plugin plugin"
|
||||||
version = "0.12.2"
|
version = "0.12.8"
|
||||||
[plugin.config]
|
[plugin.config]
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
||||||
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/plugin/functions"
|
source "$PLUGIN_AVAILABLE_PATH/plugin/functions"
|
||||||
|
source "$PLUGIN_AVAILABLE_PATH/plugin/internal-functions"
|
||||||
|
|
||||||
plugin_disable_cmd() {
|
plugin_disable_cmd() {
|
||||||
declare desc="disables plugin via command line"
|
declare desc="disables plugin via command line"
|
||||||
@@ -9,6 +10,7 @@ plugin_disable_cmd() {
|
|||||||
[[ -z $2 ]] && dokku_log_fail "Please specify a plugin to disable"
|
[[ -z $2 ]] && dokku_log_fail "Please specify a plugin to disable"
|
||||||
local PLUGIN="$2"
|
local PLUGIN="$2"
|
||||||
disable_plugin "$PLUGIN"
|
disable_plugin "$PLUGIN"
|
||||||
|
plugin_prime_bash_completion
|
||||||
}
|
}
|
||||||
|
|
||||||
plugin_disable_cmd "$@"
|
plugin_disable_cmd "$@"
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
||||||
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/plugin/functions"
|
source "$PLUGIN_AVAILABLE_PATH/plugin/functions"
|
||||||
|
source "$PLUGIN_AVAILABLE_PATH/plugin/internal-functions"
|
||||||
|
|
||||||
plugin_enable_cmd() {
|
plugin_enable_cmd() {
|
||||||
declare desc="enables plugin via command line"
|
declare desc="enables plugin via command line"
|
||||||
@@ -9,6 +10,7 @@ plugin_enable_cmd() {
|
|||||||
[[ -z $2 ]] && dokku_log_fail "Please specify a plugin to enable"
|
[[ -z $2 ]] && dokku_log_fail "Please specify a plugin to enable"
|
||||||
local PLUGIN="$2"
|
local PLUGIN="$2"
|
||||||
enable_plugin "$PLUGIN"
|
enable_plugin "$PLUGIN"
|
||||||
|
plugin_prime_bash_completion
|
||||||
}
|
}
|
||||||
|
|
||||||
plugin_enable_cmd "$@"
|
plugin_enable_cmd "$@"
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
||||||
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/plugin/functions"
|
source "$PLUGIN_AVAILABLE_PATH/plugin/functions"
|
||||||
|
source "$PLUGIN_AVAILABLE_PATH/plugin/internal-functions"
|
||||||
|
|
||||||
plugin_install_cmd() {
|
plugin_install_cmd() {
|
||||||
declare desc="installs a plugin from URL and calls install plugin trigger via command line"
|
declare desc="installs a plugin from URL and calls install plugin trigger via command line"
|
||||||
@@ -20,6 +21,7 @@ plugin_install_cmd() {
|
|||||||
plugn trigger install
|
plugn trigger install
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
plugin_prime_bash_completion
|
||||||
}
|
}
|
||||||
|
|
||||||
plugin_install_cmd "$@"
|
plugin_install_cmd "$@"
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
||||||
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/plugin/functions"
|
source "$PLUGIN_AVAILABLE_PATH/plugin/functions"
|
||||||
|
source "$PLUGIN_AVAILABLE_PATH/plugin/internal-functions"
|
||||||
|
|
||||||
plugin_uninstall_cmd() {
|
plugin_uninstall_cmd() {
|
||||||
declare desc="uninstalls plugin via command line"
|
declare desc="uninstalls plugin via command line"
|
||||||
@@ -9,6 +10,7 @@ plugin_uninstall_cmd() {
|
|||||||
[[ -z $2 ]] && dokku_log_fail "Please specify a plugin to enable"
|
[[ -z $2 ]] && dokku_log_fail "Please specify a plugin to enable"
|
||||||
local PLUGIN="$2"
|
local PLUGIN="$2"
|
||||||
uninstall_plugin "$PLUGIN"
|
uninstall_plugin "$PLUGIN"
|
||||||
|
plugin_prime_bash_completion
|
||||||
}
|
}
|
||||||
|
|
||||||
plugin_uninstall_cmd "$@"
|
plugin_uninstall_cmd "$@"
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
||||||
|
source "$PLUGIN_AVAILABLE_PATH/plugin/internal-functions"
|
||||||
|
|
||||||
plugin_update_cmd() {
|
plugin_update_cmd() {
|
||||||
declare desc="updates plugin to optional committish and calls update plugin trigger via command line"
|
declare desc="updates plugin to optional committish and calls update plugin trigger via command line"
|
||||||
@@ -10,6 +11,7 @@ plugin_update_cmd() {
|
|||||||
plugn update "$PLUGIN" "$PLUGIN_COMMITTISH"
|
plugn update "$PLUGIN" "$PLUGIN_COMMITTISH"
|
||||||
fi
|
fi
|
||||||
plugn trigger update
|
plugn trigger update
|
||||||
|
plugin_prime_bash_completion
|
||||||
}
|
}
|
||||||
|
|
||||||
plugin_update_cmd "$@"
|
plugin_update_cmd "$@"
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[plugin]
|
[plugin]
|
||||||
description = "dokku core proxy plugin"
|
description = "dokku core proxy plugin"
|
||||||
version = "0.12.2"
|
version = "0.12.8"
|
||||||
[plugin.config]
|
[plugin.config]
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ case "$1" in
|
|||||||
ps <app>, List processes running in app container(s)
|
ps <app>, List processes running in app container(s)
|
||||||
ps:scale <app> <proc>=<count> [<proc>=<count>...], Get/Set how many instances of a given process to run
|
ps:scale <app> <proc>=<count> [<proc>=<count>...], Get/Set how many instances of a given process to run
|
||||||
ps:start <app>, Start app container(s)
|
ps:start <app>, Start app container(s)
|
||||||
|
ps:startall, Starts all apps via command line
|
||||||
ps:stop <app>, Stop app container(s)
|
ps:stop <app>, Stop app container(s)
|
||||||
ps:stopall, Stop all app container(s)
|
ps:stopall, Stop all app container(s)
|
||||||
ps:rebuild <app>, Rebuild an app from source
|
ps:rebuild <app>, Rebuild an app from source
|
||||||
|
|||||||
@@ -91,17 +91,24 @@ ps_start() {
|
|||||||
declare desc="starts app"
|
declare desc="starts app"
|
||||||
local APP="$1"; verify_app_name "$APP"
|
local APP="$1"; verify_app_name "$APP"
|
||||||
local IMAGE_TAG=$(get_running_image_tag "$APP");
|
local IMAGE_TAG=$(get_running_image_tag "$APP");
|
||||||
|
local RUNNING
|
||||||
|
|
||||||
if (is_deployed "$APP"); then
|
if (is_deployed "$APP"); then
|
||||||
plugn trigger pre-start "$APP"
|
plugn trigger pre-start "$APP"
|
||||||
if ! (is_app_running "$APP"); then
|
RUNNING="$(fn-ps-is-app-running "$APP")"
|
||||||
|
|
||||||
|
if [[ "$RUNNING" == "mixed" ]]; then
|
||||||
|
dokku_log_warn "App is running in mixed mode, releasing"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$RUNNING" != "true" ]]; then
|
||||||
release_and_deploy "$APP" "$IMAGE_TAG"
|
release_and_deploy "$APP" "$IMAGE_TAG"
|
||||||
else
|
else
|
||||||
echo "App $APP already running"
|
dokku_log_warn "App $APP already running"
|
||||||
fi
|
fi
|
||||||
plugn trigger proxy-build-config "$APP"
|
plugn trigger proxy-build-config "$APP"
|
||||||
else
|
else
|
||||||
echo "App $APP has not been deployed"
|
dokku_log_warn "App $APP has not been deployed"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -109,9 +116,9 @@ ps_stop() {
|
|||||||
declare desc="stops app"
|
declare desc="stops app"
|
||||||
local APP="$1"; verify_app_name "$APP"
|
local APP="$1"; verify_app_name "$APP"
|
||||||
|
|
||||||
! (is_deployed "$APP") && echo "App $APP has not been deployed" && exit 0
|
! (is_deployed "$APP") && dokku_log_warn "App $APP has not been deployed" && exit 0
|
||||||
|
|
||||||
echo "Stopping $APP ..."
|
dokku_log_quiet "Stopping $APP ..."
|
||||||
local DOKKU_SCHEDULER=$(config_get "$APP" DOKKU_SCHEDULER || echo "docker-local")
|
local DOKKU_SCHEDULER=$(config_get "$APP" DOKKU_SCHEDULER || echo "docker-local")
|
||||||
plugn trigger scheduler-stop "$DOKKU_SCHEDULER" "$APP"
|
plugn trigger scheduler-stop "$DOKKU_SCHEDULER" "$APP"
|
||||||
plugn trigger post-stop "$APP"
|
plugn trigger post-stop "$APP"
|
||||||
@@ -132,7 +139,7 @@ ps_restart() {
|
|||||||
if (is_deployed "$APP"); then
|
if (is_deployed "$APP"); then
|
||||||
release_and_deploy "$APP" "$IMAGE_TAG"
|
release_and_deploy "$APP" "$IMAGE_TAG"
|
||||||
else
|
else
|
||||||
echo "App $APP has not been deployed"
|
dokku_log_warn "App $APP has not been deployed"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -171,3 +178,34 @@ get_restart_policies() {
|
|||||||
local -r phase_file_path=$1
|
local -r phase_file_path=$1
|
||||||
get_raw_restart_policies "$phase_file_path" | sed -e 's/^--restart=//g'
|
get_raw_restart_policies "$phase_file_path" | sed -e 's/^--restart=//g'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn-ps-app-status() {
|
||||||
|
declare APP="$1"
|
||||||
|
local PROCS=0 RUNNING=""
|
||||||
|
local APP_CIDS=$(get_app_container_ids "$APP");
|
||||||
|
|
||||||
|
for CID in $APP_CIDS; do
|
||||||
|
if (is_container_status "$CID" "Running"); then
|
||||||
|
RUNNING+="0"
|
||||||
|
else
|
||||||
|
RUNNING+="1"
|
||||||
|
fi
|
||||||
|
PROCS=$((PROCS + 1))
|
||||||
|
done
|
||||||
|
|
||||||
|
if [[ "${#RUNNING}" -eq 0 ]] || [[ "${#RUNNING}" -ne 0 ]] && [[ "$RUNNING" != *"0"* ]]; then
|
||||||
|
RUNNING="false"
|
||||||
|
elif [[ "$RUNNING" != *"1"* ]] && [[ "${#RUNNING}" -ne 0 ]]; then
|
||||||
|
RUNNING="true"
|
||||||
|
else
|
||||||
|
RUNNING="mixed"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "$PROCS $RUNNING"
|
||||||
|
}
|
||||||
|
|
||||||
|
fn-ps-is-app-running() {
|
||||||
|
declare APP="$1"
|
||||||
|
APP_STATUS=$(fn-ps-app-status "$APP")
|
||||||
|
echo "$APP_STATUS" | cut -d ' ' -f 2
|
||||||
|
}
|
||||||
@@ -33,27 +33,12 @@ cmd-ps-report-single() {
|
|||||||
local APP_DIR="$DOKKU_ROOT/$APP"
|
local APP_DIR="$DOKKU_ROOT/$APP"
|
||||||
[[ "$INFO_FLAG" == "true" ]] && INFO_FLAG=""
|
[[ "$INFO_FLAG" == "true" ]] && INFO_FLAG=""
|
||||||
|
|
||||||
local passed_phases="deploy"
|
local APP_RUNNING="$(fn-ps-app-status "$APP")"
|
||||||
local APP_CIDS=$(get_app_container_ids "$APP"); local PROCS=0; local RUNNING=""
|
local PROCS=$(echo "$APP_RUNNING" | cut -d ' ' -f 1)
|
||||||
|
local RUNNING=$(echo "$APP_RUNNING" | cut -d ' ' -f 2)
|
||||||
for CID in $APP_CIDS; do
|
|
||||||
if (is_container_status "$CID" "Running"); then
|
|
||||||
RUNNING+="0"
|
|
||||||
else
|
|
||||||
RUNNING+="1"
|
|
||||||
fi
|
|
||||||
PROCS=$((PROCS + 1))
|
|
||||||
done
|
|
||||||
|
|
||||||
if [[ "${#RUNNING}" -eq 0 ]] || [[ "${#RUNNING}" -ne 0 ]] && [[ "$RUNNING" != *"0"* ]]; then
|
|
||||||
RUNNING="false"
|
|
||||||
elif [[ "$RUNNING" != *"1"* ]] && [[ "${#RUNNING}" -ne 0 ]]; then
|
|
||||||
RUNNING="true";
|
|
||||||
else
|
|
||||||
RUNNING="mixed"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if (is_deployed "$APP"); then DEPLOYED="true"; else DEPLOYED="false"; fi
|
if (is_deployed "$APP"); then DEPLOYED="true"; else DEPLOYED="false"; fi
|
||||||
|
local passed_phases="deploy"
|
||||||
RESTARTPOLICY=$(get_restart_policies "$(get_phase_file_path "$passed_phases")" || true)
|
RESTARTPOLICY=$(get_restart_policies "$(get_phase_file_path "$passed_phases")" || true)
|
||||||
|
|
||||||
local CONTAINER_FILES="$(find "$DOKKU_ROOT/$APP" -maxdepth 1 -name "CONTAINER.*" -printf "%f\n" 2>/dev/null | sort -t . -k 2 -n | xargs)"
|
local CONTAINER_FILES="$(find "$DOKKU_ROOT/$APP" -maxdepth 1 -name "CONTAINER.*" -printf "%f\n" 2>/dev/null | sort -t . -k 2 -n | xargs)"
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[plugin]
|
[plugin]
|
||||||
description = "dokku core ps plugin"
|
description = "dokku core ps plugin"
|
||||||
version = "0.12.2"
|
version = "0.12.8"
|
||||||
[plugin.config]
|
[plugin.config]
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ ps_main_cmd() {
|
|||||||
[[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
|
[[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
|
||||||
|
|
||||||
local APP="$2"; verify_app_name "$APP"
|
local APP="$2"; verify_app_name "$APP"
|
||||||
! (is_deployed "$APP") && echo "App $APP has not been deployed" && exit 0
|
! (is_deployed "$APP") && dokku_log_warn "App $APP has not been deployed" && exit 0
|
||||||
|
|
||||||
local DOKKU_APP_RUNNING_CONTAINER_IDS=$(get_app_running_container_ids "$APP")
|
local DOKKU_APP_RUNNING_CONTAINER_IDS=$(get_app_running_container_ids "$APP")
|
||||||
|
|
||||||
|
|||||||
38
plugins/ps/subcommands/startall
Executable file
38
plugins/ps/subcommands/startall
Executable file
@@ -0,0 +1,38 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
||||||
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
|
source "$PLUGIN_AVAILABLE_PATH/config/functions"
|
||||||
|
source "$PLUGIN_AVAILABLE_PATH/ps/functions"
|
||||||
|
|
||||||
|
ps_startall_cmd() {
|
||||||
|
declare desc="starts all apps via command line"
|
||||||
|
local cmd="ps:startall"
|
||||||
|
local GNU_PARALLEL
|
||||||
|
|
||||||
|
if which parallel > /dev/null 2>&1; then
|
||||||
|
dokku_log_info1 "Starting in parallel"
|
||||||
|
GNU_PARALLEL=$(parallel -V 2>&1 | grep GNU || true)
|
||||||
|
if [[ -z "$GNU_PARALLEL" ]]; then
|
||||||
|
# shellcheck disable=SC2046
|
||||||
|
parallel -i bash -c "dokku ps:start {}" -- $(dokku_apps)
|
||||||
|
else
|
||||||
|
dokku_apps | parallel 'dokku ps:start {}'
|
||||||
|
fi
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
for app in $(dokku_apps); do
|
||||||
|
if ! (is_deployed "$app"); then
|
||||||
|
dokku_log_warn "App $app has not been deployed"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
dokku_log_verbose "Starting app $app ..."
|
||||||
|
if ps_start "$app"; then
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
dokku_log_warn "dokku ps:start ${app} failed"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
ps_startall_cmd "$@"
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
[plugin]
|
[plugin]
|
||||||
description = "dokku core repo plugin"
|
description = "dokku core repo plugin"
|
||||||
version = "0.12.2"
|
version = "0.12.8"
|
||||||
[plugin.config]
|
[plugin.config]
|
||||||
|
|||||||
@@ -21,11 +21,12 @@ func main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
cacheDir := strings.Join([]string{common.MustGetEnv("DOKKU_ROOT"), appName, "cache"}, "/")
|
cacheDir := strings.Join([]string{common.MustGetEnv("DOKKU_ROOT"), appName, "cache"}, "/")
|
||||||
|
cacheHostDir := strings.Join([]string{common.MustGetEnv("DOKKU_HOST_ROOT"), appName, "cache"}, "/")
|
||||||
dokkuGlobalRunArgs := common.MustGetEnv("DOKKU_GLOBAL_RUN_ARGS")
|
dokkuGlobalRunArgs := common.MustGetEnv("DOKKU_GLOBAL_RUN_ARGS")
|
||||||
image := common.GetDeployingAppImageName(appName, "", "")
|
image := common.GetDeployingAppImageName(appName, "", "")
|
||||||
if info, _ := os.Stat(cacheDir); info != nil && info.IsDir() {
|
if info, _ := os.Stat(cacheDir); info != nil && info.IsDir() {
|
||||||
purgeCacheCmd := common.NewShellCmd(strings.Join([]string{"docker run --rm", dokkuGlobalRunArgs,
|
purgeCacheCmd := common.NewShellCmd(strings.Join([]string{"docker run --rm", dokkuGlobalRunArgs,
|
||||||
"-v", strings.Join([]string{cacheDir, ":/cache"}, ""), image,
|
"-v", strings.Join([]string{cacheHostDir, ":/cache"}, ""), image,
|
||||||
`find /cache -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} ;`}, " "))
|
`find /cache -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} ;`}, " "))
|
||||||
purgeCacheCmd.Execute()
|
purgeCacheCmd.Execute()
|
||||||
err := os.MkdirAll(cacheDir, 0644)
|
err := os.MkdirAll(cacheDir, 0644)
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[plugin]
|
[plugin]
|
||||||
description = "dokku core scheduler-docker-local plugin"
|
description = "dokku core scheduler-docker-local plugin"
|
||||||
version = "0.12.2"
|
version = "0.12.8"
|
||||||
[plugin.config]
|
[plugin.config]
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[plugin]
|
[plugin]
|
||||||
description = "dokku core shell plugin"
|
description = "dokku core shell plugin"
|
||||||
version = "0.12.2"
|
version = "0.12.8"
|
||||||
[plugin.config]
|
[plugin.config]
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[plugin]
|
[plugin]
|
||||||
description = "dokku core ssh-keys plugin"
|
description = "dokku core ssh-keys plugin"
|
||||||
version = "0.12.2"
|
version = "0.12.8"
|
||||||
[plugin.config]
|
[plugin.config]
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[plugin]
|
[plugin]
|
||||||
description = "dokku core storage plugin"
|
description = "dokku core storage plugin"
|
||||||
version = "0.12.2"
|
version = "0.12.8"
|
||||||
[plugin.config]
|
[plugin.config]
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[plugin]
|
[plugin]
|
||||||
description = "dokku core tags plugin"
|
description = "dokku core tags plugin"
|
||||||
version = "0.12.2"
|
version = "0.12.8"
|
||||||
[plugin.config]
|
[plugin.config]
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[plugin]
|
[plugin]
|
||||||
description = "dokku core tar plugin"
|
description = "dokku core tar plugin"
|
||||||
version = "0.12.2"
|
version = "0.12.8"
|
||||||
[plugin.config]
|
[plugin.config]
|
||||||
|
|||||||
2
rpm.mk
2
rpm.mk
@@ -51,6 +51,7 @@ rpm-dokku:
|
|||||||
rm -rf /tmp/tmp /tmp/build dokku_*_$(RPM_ARCHITECTURE).rpm
|
rm -rf /tmp/tmp /tmp/build dokku_*_$(RPM_ARCHITECTURE).rpm
|
||||||
mkdir -p /tmp/tmp /tmp/build
|
mkdir -p /tmp/tmp /tmp/build
|
||||||
|
|
||||||
|
mkdir -p /tmp/build/usr/share/bash-completion/completions
|
||||||
mkdir -p /tmp/build/usr/bin
|
mkdir -p /tmp/build/usr/bin
|
||||||
mkdir -p /tmp/build/usr/share/doc/dokku
|
mkdir -p /tmp/build/usr/share/doc/dokku
|
||||||
mkdir -p /tmp/build/usr/share/dokku/contrib
|
mkdir -p /tmp/build/usr/share/dokku/contrib
|
||||||
@@ -60,6 +61,7 @@ rpm-dokku:
|
|||||||
|
|
||||||
cp dokku /tmp/build/usr/bin
|
cp dokku /tmp/build/usr/bin
|
||||||
cp LICENSE /tmp/build/usr/share/doc/dokku/copyright
|
cp LICENSE /tmp/build/usr/share/doc/dokku/copyright
|
||||||
|
cp contrib/bash-completion /tmp/build/usr/share/bash-completion/completions/dokku
|
||||||
find . -name ".DS_Store" -depth -exec rm {} \;
|
find . -name ".DS_Store" -depth -exec rm {} \;
|
||||||
$(MAKE) go-build
|
$(MAKE) go-build
|
||||||
cp common.mk /tmp/build/var/lib/dokku/core-plugins/common.mk
|
cp common.mk /tmp/build/var/lib/dokku/core-plugins/common.mk
|
||||||
|
|||||||
@@ -131,7 +131,10 @@ teardown () {
|
|||||||
echo "output: "$output
|
echo "output: "$output
|
||||||
echo "status: "$status
|
echo "status: "$status
|
||||||
assert_success
|
assert_success
|
||||||
|
}
|
||||||
|
|
||||||
|
@test "(apps) apps:clone --skip-deploy" {
|
||||||
|
deploy_app
|
||||||
run bash -c "dokku apps:clone --skip-deploy $TEST_APP great-test-name"
|
run bash -c "dokku apps:clone --skip-deploy $TEST_APP great-test-name"
|
||||||
echo "output: "$output
|
echo "output: "$output
|
||||||
echo "status: "$status
|
echo "status: "$status
|
||||||
@@ -146,6 +149,22 @@ teardown () {
|
|||||||
assert_success
|
assert_success
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@test "(apps) apps:clone --ignore-existing" {
|
||||||
|
deploy_app
|
||||||
|
run bash -c "dokku apps:create great-test-name"
|
||||||
|
echo "output: "$output
|
||||||
|
echo "status: "$status
|
||||||
|
assert_success
|
||||||
|
run bash -c "dokku apps:clone --ignore-existing $TEST_APP great-test-name"
|
||||||
|
echo "output: "$output
|
||||||
|
echo "status: "$status
|
||||||
|
assert_success
|
||||||
|
run bash -c "dokku --force apps:destroy great-test-name"
|
||||||
|
echo "output: "$output
|
||||||
|
echo "status: "$status
|
||||||
|
assert_success
|
||||||
|
}
|
||||||
|
|
||||||
@test "(apps) apps:exists" {
|
@test "(apps) apps:exists" {
|
||||||
run dokku apps:exists $TEST_APP
|
run dokku apps:exists $TEST_APP
|
||||||
echo "output: "$output
|
echo "output: "$output
|
||||||
|
|||||||
@@ -14,10 +14,6 @@ teardown() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@test "(ps) herokuish" {
|
@test "(ps) herokuish" {
|
||||||
# CI support: 'Ah. I just spoke with our Docker expert --
|
|
||||||
# looks like docker exec is built to work with docker-under-libcontainer,
|
|
||||||
# but we're using docker-under-lxc. I don't have an estimated time for the fix, sorry
|
|
||||||
skip "circleci does not support docker exec at the moment."
|
|
||||||
run bash -c "dokku ps $TEST_APP | grep -q \"node web.js\""
|
run bash -c "dokku ps $TEST_APP | grep -q \"node web.js\""
|
||||||
echo "output: "$output
|
echo "output: "$output
|
||||||
echo "status: "$status
|
echo "status: "$status
|
||||||
|
|||||||
@@ -70,3 +70,28 @@ teardown() {
|
|||||||
echo "status: "$status
|
echo "status: "$status
|
||||||
assert_output "herokuish"
|
assert_output "herokuish"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@test "(build-env) DOKKU_ROOT cache bind is used by default" {
|
||||||
|
deploy_app
|
||||||
|
|
||||||
|
BUILD_CID=$(docker ps -a |grep $TEST_APP |grep /bin/bash | awk '{print $1}')
|
||||||
|
run /bin/bash -c "docker inspect --format '{{ .HostConfig.Binds }}' $BUILD_CID | tr -d '[]' | cut -f1 -d:"
|
||||||
|
echo "output: "$output
|
||||||
|
echo "status: "$status
|
||||||
|
assert_output "$DOKKU_ROOT/$TEST_APP/cache"
|
||||||
|
}
|
||||||
|
|
||||||
|
@test "(build-env) DOKKU_HOST_ROOT cache bind is used if set" {
|
||||||
|
TMP_ROOT=$(mktemp -d)
|
||||||
|
mkdir -p $DOKKU_ROOT/.dokkurc
|
||||||
|
echo export DOKKU_HOST_ROOT="$TMP_ROOT" > $DOKKU_ROOT/.dokkurc/HOST_ROOT
|
||||||
|
DOKKU_HOST_ROOT="$TMP_ROOT" deploy_app
|
||||||
|
|
||||||
|
BUILD_CID=$(docker ps -a |grep $TEST_APP |grep /bin/bash | awk '{print $1}')
|
||||||
|
run /bin/bash -c "docker inspect --format '{{ .HostConfig.Binds }}' $BUILD_CID | tr -d '[]' | cut -f1 -d:"
|
||||||
|
echo "output: "$output
|
||||||
|
echo "status: "$status
|
||||||
|
assert_output "$TMP_ROOT/$TEST_APP/cache"
|
||||||
|
|
||||||
|
rm -rf $TMP_ROOT $DOKKU_ROOT/.dokkurc/HOST_ROOT
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user