Merge pull request #2733 from dokku/jg-2732-rpm-docker

fix: use or statements to add support for new docker packages
This commit is contained in:
Jose Diaz-Gonzalez authored and GitHub committed 2017-04-21 15:14:46 -06:00
commit 518757c47d
2 files changed
+3 -3

No files matched your search

+1 -1
View File
@@ -106,7 +106,7 @@ deb-herokuish:
cp -rf /tmp/tmp/herokuish /tmp/build/var/lib/herokuish cp -rf /tmp/tmp/herokuish /tmp/build/var/lib/herokuish
@echo "-> Creating $(HEROKUISH_PACKAGE_NAME)" @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 mv *.deb /tmp
deb-dokku: deb-dokku:
+2 -2
View File
@@ -35,7 +35,7 @@ rpm-herokuish:
-v $(HEROKUISH_VERSION) \ -v $(HEROKUISH_VERSION) \
-a $(RPM_ARCHITECTURE) \ -a $(RPM_ARCHITECTURE) \
-p $(HEROKUISH_RPM_PACKAGE_NAME) \ -p $(HEROKUISH_RPM_PACKAGE_NAME) \
--depends 'docker-engine >= 1.9.1' \ --depends '/usr/bin/docker' \
--depends 'sudo' \ --depends 'sudo' \
--after-install rpm/herokuish.postinst \ --after-install rpm/herokuish.postinst \
--url "https://github.com/$(HEROKUISH_REPO_NAME)" \ --url "https://github.com/$(HEROKUISH_REPO_NAME)" \
@@ -97,7 +97,7 @@ endif
--depends 'man-db' \ --depends 'man-db' \
--depends 'sshcommand' \ --depends 'sshcommand' \
--depends 'gliderlabs-sigil' \ --depends 'gliderlabs-sigil' \
--depends 'docker-engine >= 1.9.1' \ --depends '/usr/bin/docker' \
--depends 'bind-utils' \ --depends 'bind-utils' \
--depends 'nginx' \ --depends 'nginx' \
--depends 'plugn' \ --depends 'plugn' \