diff --git a/Makefile b/Makefile index 61718d955..967e9ef90 100644 --- a/Makefile +++ b/Makefile @@ -119,12 +119,15 @@ plugin-dependencies: plugn procfile-util plugins: plugn procfile-util docker sudo -E dokku plugin:install --core -dependencies: apt-update sshcommand plugn procfile-util docker help2man man-db sigil +dependencies: apt-update sshcommand plugn procfile-util docker help2man man-db sigil dos2unix $(MAKE) -e stack apt-update: apt-get update -qq +dos2unix: + apt-get install -qq -y dos2unix + help2man: apt-get install -qq -y help2man diff --git a/debian/control b/debian/control index 0dde0157d..d7022ca9f 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Version: 0.17.9 Section: web Priority: optional Architecture: amd64 -Depends: locales, git, curl, 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.io (>= 1.7.1) | docker-ce | docker-ee, net-tools, software-properties-common, procfile-util, python-software-properties | python3-software-properties, rsyslog +Depends: locales, git, curl, 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.io (>= 1.7.1) | docker-ce | docker-ee, net-tools, software-properties-common, procfile-util, python-software-properties | python3-software-properties, rsyslog, dos2unix 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 02dca57ea..6e9f740aa 100644 --- a/rpm.mk +++ b/rpm.mk @@ -63,6 +63,7 @@ endif --depends '/usr/bin/docker' \ --depends 'bind-utils' \ --depends 'curl' \ + --depends 'dos2unix' \ --depends 'git' \ --depends 'gliderlabs-sigil' \ --depends 'man-db' \ diff --git a/tests/ci/setup.sh b/tests/ci/setup.sh index 8f4c88a33..0ebe43714 100755 --- a/tests/ci/setup.sh +++ b/tests/ci/setup.sh @@ -29,7 +29,7 @@ install_dependencies() { sudo add-apt-repository -y ppa:nginx/stable sudo apt-get update - sudo apt-get -qq -y install cgroupfs-mount nginx + sudo apt-get -qq -y install cgroupfs-mount dos2unix nginx sudo cp "${ROOT_DIR}/tests/dhparam.pem" /etc/nginx/dhparam.pem sudo dpkg -i "${ROOT_DIR}/build/$HEROKUISH_PACKAGE_NAME" \