From 4639f3c930ef1adf1d2c6583798c1f1245a41f2f Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 20 Apr 2017 21:38:25 -0600 Subject: [PATCH 1/4] fix: use or statements to add support for new docker packages Closes #2732 [ci skip] --- rpm.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm.mk b/rpm.mk index 55702f2b9..c6d27615e 100644 --- a/rpm.mk +++ b/rpm.mk @@ -97,7 +97,7 @@ endif --depends 'man-db' \ --depends 'sshcommand' \ --depends 'gliderlabs-sigil' \ - --depends 'docker-engine >= 1.9.1' \ + --depends 'docker-engine >= 1.9.1 | docker-engine-cs >= 1.9.1 | docker-ce | docker-ee' \ --depends 'bind-utils' \ --depends 'nginx' \ --depends 'plugn' \ From bc4b9dc5f3f97fa6e7ae786f907fe1ecee08804c Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 21 Apr 2017 10:26:24 -0600 Subject: [PATCH 2/4] fix: only require the docker bin Docker has this thing where they rebrand the debian package name once a year, and as YUM doesn't resolve anything like a "Provides" field, this is the best we can do (unless they all required the same metapackage). Note that now we can't ensure a specific minor docker version via RPM, though I feel as though if you choose a crappy OS/package manager and we fail you, thats on you, not Dokku. Closes #2732 --- rpm.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm.mk b/rpm.mk index c6d27615e..4d2d1207b 100644 --- a/rpm.mk +++ b/rpm.mk @@ -97,7 +97,7 @@ endif --depends 'man-db' \ --depends 'sshcommand' \ --depends 'gliderlabs-sigil' \ - --depends 'docker-engine >= 1.9.1 | docker-engine-cs >= 1.9.1 | docker-ce | docker-ee' \ + --depends '/usr/bin/docker' \ --depends 'bind-utils' \ --depends 'nginx' \ --depends 'plugn' \ From 39c117a3cc319c38734e490c4f7036305713508f Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 21 Apr 2017 14:26:14 -0600 Subject: [PATCH 3/4] fix: update herokuish dependency for docker [ci skip] --- rpm.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm.mk b/rpm.mk index 4d2d1207b..a1391a7c4 100644 --- a/rpm.mk +++ b/rpm.mk @@ -35,7 +35,7 @@ rpm-herokuish: -v $(HEROKUISH_VERSION) \ -a $(RPM_ARCHITECTURE) \ -p $(HEROKUISH_RPM_PACKAGE_NAME) \ - --depends 'docker-engine >= 1.9.1' \ + --depends '/usr/bin/docker' \ --depends 'sudo' \ --after-install rpm/herokuish.postinst \ --url "https://github.com/$(HEROKUISH_REPO_NAME)" \ From 593f7d42d8e5318445fa013f273575343097b728 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 21 Apr 2017 14:27:24 -0600 Subject: [PATCH 4/4] feat: allow any version of docker-ee and docker-ce [ci skip] --- deb.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deb.mk b/deb.mk index ba8d61ea8..ff3001251 100644 --- a/deb.mk +++ b/deb.mk @@ -106,7 +106,7 @@ deb-herokuish: cp -rf /tmp/tmp/herokuish /tmp/build/var/lib/herokuish @echo "-> Creating $(HEROKUISH_PACKAGE_NAME)" - sudo fpm -t deb -s dir -C /tmp/build -n herokuish -v $(HEROKUISH_VERSION) -a $(HEROKUISH_ARCHITECTURE) -p $(HEROKUISH_PACKAGE_NAME) --deb-pre-depends 'docker-engine-cs (>= 1.9.1) | docker-engine (>= 1.9.1)' --deb-pre-depends sudo --after-install /tmp/tmp/post-install --url "https://github.com/$(HEROKUISH_REPO_NAME)" --description $(HEROKUISH_DESCRIPTION) --license 'MIT License' . + sudo fpm -t deb -s dir -C /tmp/build -n herokuish -v $(HEROKUISH_VERSION) -a $(HEROKUISH_ARCHITECTURE) -p $(HEROKUISH_PACKAGE_NAME) --deb-pre-depends 'docker-engine-cs (>= 1.9.1) | docker-engine (>= 1.9.1) | docker-ce | docker-ee' --deb-pre-depends sudo --after-install /tmp/tmp/post-install --url "https://github.com/$(HEROKUISH_REPO_NAME)" --description $(HEROKUISH_DESCRIPTION) --license 'MIT License' . mv *.deb /tmp deb-dokku: