diff options
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 6 | ||||
-rw-r--r-- | dokku.install | 20 |
3 files changed, 13 insertions, 21 deletions
@@ -1,6 +1,6 @@ pkgbase = dokku pkgdesc = Docker powered mini-Heroku in around 100 lines of Bash. - pkgver = 0.17.9 + pkgver = 0.18.2 pkgrel = 1 url = https://github.com/dokku/dokku install = dokku.install @@ -18,10 +18,10 @@ pkgbase = dokku depends = procfile-util depends = rsyslog depends = sshcommand - source = https://github.com/dokku/dokku/archive/v0.17.9.zip + source = https://github.com/dokku/dokku/archive/v0.18.2.zip source = dokku.install - sha256sums = cc24ac6717d6277445ed339e03409771b59000dd2f1bd1101cb0fd28dc147d59 - sha256sums = c2d7561e5e9931b13421af629672fe417ab36db0f803cadacbf3614507cc0601 + sha256sums = b7a71a0f9566391939643eb08d155109068ae330db1d37b0e2af9523c2fed3d0 + sha256sums = 5dd473290d9159d27286628bb82a93adb6ea43a12057e625d02abd0bf332384c pkgname = dokku @@ -3,7 +3,7 @@ # Contributor: Morris Jobke <hey AT morrisjobke DOT de> pkgname=dokku -pkgver=0.17.9 +pkgver=0.18.2 pkgrel=1 pkgdesc="Docker powered mini-Heroku in around 100 lines of Bash." arch=(any) @@ -27,8 +27,8 @@ source=( "https://github.com/dokku/dokku/archive/v${pkgver}.zip" "${pkgname}.install" ) -sha256sums=('cc24ac6717d6277445ed339e03409771b59000dd2f1bd1101cb0fd28dc147d59' - 'c2d7561e5e9931b13421af629672fe417ab36db0f803cadacbf3614507cc0601') +sha256sums=('b7a71a0f9566391939643eb08d155109068ae330db1d37b0e2af9523c2fed3d0' + '5dd473290d9159d27286628bb82a93adb6ea43a12057e625d02abd0bf332384c') install="${pkgname}.install" prepare() { diff --git a/dokku.install b/dokku.install index 20fb8bd293cd..640fe31ae90d 100644 --- a/dokku.install +++ b/dokku.install @@ -9,6 +9,9 @@ post_install() { echo "Add dokku user to docker group" (egrep -i "^docker" /etc/group || groupadd docker) &>/dev/null usermod -aG docker dokku + mkdir -p "$DOKKU_ROOT/.ssh" "$DOKKU_ROOT/.dokkurc" + touch "$DOKKU_ROOT/.ssh/authorized_keys" + chown -R dokku:dokku "$DOKKU_ROOT/.ssh" "${DOKKU_ROOT}/.dokkurc" echo "Setting up storage directories" mkdir -p "$DOKKU_LIB_ROOT/data/storage" @@ -16,12 +19,9 @@ post_install() { echo "Setting up plugin directories" # should be replaced by `plugn init` - mkdir -p "$DOKKU_LIB_ROOT/core-plugins/available" - mkdir -p "$DOKKU_LIB_ROOT/plugins/available" - mkdir -p "$DOKKU_LIB_ROOT/core-plugins/enabled" - mkdir -p "$DOKKU_LIB_ROOT/plugins/enabled" - touch "$DOKKU_LIB_ROOT/core-plugins/config.toml" - touch "$DOKKU_LIB_ROOT/plugins/config.toml" + mkdir -p "$DOKKU_LIB_ROOT/core-plugins/available" "$DOKKU_LIB_ROOT/plugins/available" + mkdir -p "$DOKKU_LIB_ROOT/core-plugins/enabled" "$DOKKU_LIB_ROOT/plugins/enabled" + touch "$DOKKU_LIB_ROOT/core-plugins/config.toml" "$DOKKU_LIB_ROOT/plugins/config.toml" echo "Migrating old plugins" find "$DOKKU_LIB_ROOT/plugins" -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read -r plugin; do @@ -47,8 +47,6 @@ post_install() { echo "Ensure proper sshcommand path" echo /usr/bin/dokku > "$DOKKU_ROOT/.sshcommand" - mkdir -p "$DOKKU_ROOT/.ssh" - touch "$DOKKU_ROOT/.ssh/authorized_keys" if [[ -f .ssh/authorized_keys ]]; then sed -i.bak 's#/usr/local/bin/dokku#/usr/bin/dokku#' "$DOKKU_ROOT/.ssh/authorized_keys" rm "$DOKKU_ROOT/.ssh/authorized_keys" @@ -64,12 +62,6 @@ post_install() { echo "Update hostname" hostname -f > "$DOKKU_ROOT/HOSTNAME" - echo "Create nginx config folder" - mkdir -p /etc/nginx/conf.d - - echo "Add sudoers rule for dokku control over nginx" - echo "%dokku ALL=(ALL) NOPASSWD:/usr/bin/systemctl reload nginx, /usr/sbin/nginx -t" > /etc/sudoers.d/dokku-nginx - echo " Please add your ssh pubkey like: $ cat ~/.ssh/id_rsa.pub | sudo sshcommand acl-add dokku default |