Mirrors/dokku
1
0
Fork 0
mirror of https://github.com/dokku/dokku.git synced 2025-12-16 03:57:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: add missing dos2unix dependency

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2019-08-05 12:09:53 -04:00
parent 78a5e4d331
commit 697afaa2cc
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -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

2
debian/control vendored
View File

@@ -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 <dokku@josediazgonzalez.com>

1
rpm.mk
View File

@@ -63,6 +63,7 @@ endif
--depends '/usr/bin/docker' \
--depends 'bind-utils' \
--depends 'curl' \
--depends 'dos2unix' \
--depends 'git' \
--depends 'gliderlabs-sigil' \
--depends 'man-db' \

2
tests/ci/setup.sh
View File

@@ -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" \