diff --git a/Makefile b/Makefile index 55cbed0cd..df092c880 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ DOKKU_VERSION ?= master SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/v0.7.0/sshcommand +PROCFILE_UTIL_URL ?= https://github.com/josegonzalez/go-procfile-util/releases/download/v0.2.0/procfile-util_0.2.0_linux_x86_64.tgz PLUGN_URL ?= https://github.com/dokku/plugn/releases/download/v0.3.0/plugn_0.3.0_linux_x86_64.tgz SIGIL_URL ?= https://github.com/gliderlabs/sigil/releases/download/v0.4.0/sigil_0.4.0_Linux_x86_64.tgz STACK_URL ?= https://github.com/gliderlabs/herokuish.git @@ -26,7 +27,7 @@ endif include common.mk -.PHONY: all apt-update install version copyfiles copyplugin man-db plugins dependencies sshcommand plugn docker aufs stack count dokku-installer vagrant-acl-add vagrant-dokku go-build +.PHONY: all apt-update install version copyfiles copyplugin man-db plugins dependencies sshcommand procfile-util plugn docker aufs stack count dokku-installer vagrant-acl-add vagrant-dokku go-build include tests.mk include deb.mk @@ -109,13 +110,13 @@ else echo $(DOKKU_VERSION) > ~dokku/VERSION endif -plugin-dependencies: plugn +plugin-dependencies: plugn procfile-util sudo -E dokku plugin:install-dependencies --core -plugins: plugn docker +plugins: plugn procfile-util docker sudo -E dokku plugin:install --core -dependencies: apt-update sshcommand plugn docker help2man man-db sigil +dependencies: apt-update sshcommand plugn procfile-util docker help2man man-db sigil $(MAKE) -e stack apt-update: @@ -132,6 +133,10 @@ sshcommand: chmod +x /usr/local/bin/sshcommand sshcommand create dokku /usr/local/bin/dokku +procfile-util: + wget -qO /tmp/procfile-util_latest.tgz ${PROCFILE_UTIL_URL} + tar xzf /tmp/procfile-util_latest.tgz -C /usr/local/bin + plugn: wget -qO /tmp/plugn_latest.tgz ${PLUGN_URL} tar xzf /tmp/plugn_latest.tgz -C /usr/local/bin diff --git a/debian/control b/debian/control index 0459eaa80..e2e60dbdd 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Version: 0.12.13 Section: web Priority: optional Architecture: amd64 -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, net-tools, 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, net-tools, software-properties-common, procfile-util, python-software-properties | python3-software-properties, rsyslog 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 Maintainer: Jose Diaz-Gonzalez diff --git a/rpm.mk b/rpm.mk index 1ac65180b..61340546d 100644 --- a/rpm.mk +++ b/rpm.mk @@ -106,6 +106,7 @@ endif --depends 'nc' \ --depends 'nginx >= 1.8.0' \ --depends 'plugn' \ + --depends 'procfile-util' \ --depends 'python' \ --depends 'sshcommand' \ --depends 'sudo' \