From 246e54a293dc5cb91f9aeb6bef870224ef3c8f14 Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Tue, 28 Feb 2017 17:02:33 -0700 Subject: [PATCH 1/2] update herokuish to 0.3.26 --- deb.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deb.mk b/deb.mk index dfc253fa3..6a60b41aa 100644 --- a/deb.mk +++ b/deb.mk @@ -1,6 +1,6 @@ HEROKUISH_DESCRIPTION = 'Herokuish uses Docker and Buildpacks to build applications like Heroku' HEROKUISH_REPO_NAME ?= gliderlabs/herokuish -HEROKUISH_VERSION ?= 0.3.25 +HEROKUISH_VERSION ?= 0.3.26 HEROKUISH_ARCHITECTURE = amd64 HEROKUISH_PACKAGE_NAME = herokuish_$(HEROKUISH_VERSION)_$(HEROKUISH_ARCHITECTURE).deb From 1e387b3b420a49ff87d16265a30efade2f1a0dbf Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 3 Mar 2017 09:04:49 -0700 Subject: [PATCH 2/2] fix: support new docker packages Refs #2636 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index d4ff40970..75d42b2aa 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Version: 0.8.0 Section: web Priority: optional Architecture: amd64 -Depends: locales, git, make, curl, gcc, man-db, sshcommand (>= 0.6.0), gliderlabs-sigil, docker-engine-cs (>= 1.9.1) | docker-engine (>= 1.9.1), software-properties-common, python-software-properties +Depends: locales, git, make, curl, gcc, man-db, sshcommand (>= 0.6.0), gliderlabs-sigil, docker-engine-cs (>= 1.9.1) | docker-engine (>= 1.9.1) | docker-ce | docker-ee, software-properties-common, python-software-properties Recommends: herokuish (>= 0.3.4), parallel Pre-Depends: nginx, dnsutils, cgroupfs-mount | cgroup-lite, plugn (>= 0.2.2), sudo, python2.7, debconf Maintainer: Jose Diaz-Gonzalez