diff options
-rw-r--r-- | .SRCINFO | 11 | ||||
-rw-r--r-- | PKGBUILD | 11 | ||||
-rw-r--r-- | dokku.install | 26 |
3 files changed, 30 insertions, 18 deletions
@@ -1,12 +1,13 @@ pkgbase = dokku - pkgdesc = Docker powered mini-Heroku in around 100 lines of Bash. - pkgver = 0.19.13 + pkgdesc = Docker-powered PaaS that helps build and manage the lifecycle of applications + pkgver = 0.20.4 pkgrel = 1 url = https://github.com/dokku/dokku install = dokku.install arch = any license = MIT depends = bind-tools + depends = cpio depends = docker depends = dos2unix depends = go @@ -19,10 +20,10 @@ pkgbase = dokku depends = procfile-util depends = rsyslog depends = sshcommand - source = https://github.com/dokku/dokku/archive/v0.19.13.zip + source = https://github.com/dokku/dokku/archive/v0.20.4.zip source = dokku.install - sha256sums = d983eb445ee615895dfcdb39bf549f92317c941364c25d6e64a1362c362c9619 - sha256sums = b3588167208b524d3126fc18d9ee7e3a570a5c52eedc8eaceba6693fa82a0d12 + sha256sums = 82a03d0795ff1029b38760b096be3eedd993c7c7c66e8b9b5347ca6bbe81aa41 + sha256sums = 17eeb4e092b1bc2bcd904242cd9c11493fc68bb030061da1044d955bb319bd8a pkgname = dokku @@ -3,14 +3,15 @@ # Contributor: Morris Jobke <hey AT morrisjobke DOT de> pkgname=dokku -pkgver=0.19.13 +pkgver=0.20.4 pkgrel=1 -pkgdesc="Docker powered mini-Heroku in around 100 lines of Bash." +pkgdesc="Docker-powered PaaS that helps build and manage the lifecycle of applications" arch=(any) url="https://github.com/dokku/dokku" license=(MIT) depends=( 'bind-tools' + 'cpio' 'docker' 'dos2unix' 'go' @@ -28,8 +29,8 @@ source=( "https://github.com/dokku/dokku/archive/v${pkgver}.zip" "${pkgname}.install" ) -sha256sums=('d983eb445ee615895dfcdb39bf549f92317c941364c25d6e64a1362c362c9619' - 'b3588167208b524d3126fc18d9ee7e3a570a5c52eedc8eaceba6693fa82a0d12') +sha256sums=('82a03d0795ff1029b38760b096be3eedd993c7c7c66e8b9b5347ca6bbe81aa41' + '17eeb4e092b1bc2bcd904242cd9c11493fc68bb030061da1044d955bb319bd8a') install="${pkgname}.install" prepare() { @@ -63,7 +64,7 @@ package() { # Move all files in place mkdir -p "${pkgdir}/var/lib/dokku/core-plugins/available" - cp -r plugins/* "${pkgdir}/var/lib/dokku/core-plugins/available" + cp -R plugins/* "${pkgdir}/var/lib/dokku/core-plugins/available" # Version echo $pkgver > "${pkgdir}/var/lib/dokku/VERSION" diff --git a/dokku.install b/dokku.install index d2958b524d26..b5400698ace7 100644 --- a/dokku.install +++ b/dokku.install @@ -4,23 +4,24 @@ readonly DOKKU_ROOT="${DOKKU_ROOT:-/home/dokku}" readonly DOKKU_LIB_ROOT="${DOKKU_LIB_PATH:-/var/lib/dokku}" readonly DOKKU_LOGS_DIR="${DOKKU_LOGS_DIR:-/var/log/dokku}" -post_install() { - echo "Create dokku user" - sshcommand create dokku /usr/bin/dokku &>/dev/null - - echo "Add dokku user to docker group" - (grep -E "^docker" /etc/group || groupadd docker) &>/dev/null +setup-user() { + echo "Setting up dokku user" + /usr/bin/sshcommand create dokku /usr/bin/dokku &>/dev/null + (grep -i -E "^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" +} +setup-storage() { echo "Setting up storage directories" mkdir -p "${DOKKU_LIB_ROOT}/data/storage" chown dokku:dokku "${DOKKU_LIB_ROOT}/data" "${DOKKU_LIB_ROOT}/data/storage" +} +setup-plugins() { echo "Setting up plugin directories" - # should be replaced by `plugn init` 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" @@ -50,13 +51,22 @@ post_install() { echo "Install all core plugins" dokku plugin:install --core sed -i 's/ syslog dokku$/ root dokku/g' /etc/logrotate.d/dokku +} +setup-sshcommand() { echo "Ensure proper sshcommand path" - echo /usr/bin/dokku > "${DOKKU_ROOT}/.sshcommand" + echo '/usr/bin/dokku' > "${DOKKU_ROOT}/.sshcommand" 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" fi +} + +post_install() { + setup-user + setup-storage + setup-plugins + setup-sshcommand echo "Update version file" rm -f "${DOKKU_ROOT}/VERSION" |