From 7e1e0ebb807aa41abfb6baea65f3977d3495bb43 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 30 Jun 2015 14:06:01 -0400 Subject: [PATCH 1/3] Require lxc-docker <= 1.6.2 1.7.0 Has issues with `docker ps` output, breaking all plugins [ci-skip] --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 8397988f5..5a9b8a0e8 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Version: 0.3.12 Section: base Priority: optional Architecture: amd64 -Depends: locales, git, make, curl, software-properties-common, lxc-docker (>= 1.4.0), gcc, python-software-properties, man-db, buildstep, sshcommand, pluginhook +Depends: locales, git, make, curl, software-properties-common, lxc-docker (>= 1.4.0), lxc-docker (<= 1.6.2), gcc, python-software-properties, man-db, buildstep, sshcommand, pluginhook Pre-Depends: nginx, dnsutils, ruby, ruby-dev, rubygem-rack, rubygem-rack-protection, rubygem-sinatra, rubygem-tilt, apparmor, cgroup-lite Provides: dokku Maintainer: Jose Diaz-Gonzalez From 5668f76cddc4fce392dac6cff418794d9e3bb68a Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 30 Jun 2015 15:52:21 -0400 Subject: [PATCH 2/3] Install specific version of docker [ci skip] --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 752218746..c69d5bda4 100644 --- a/Makefile +++ b/Makefile @@ -93,7 +93,7 @@ ifndef CI ifdef DOCKER_VERSION apt-get install -qq -y lxc-docker-${DOCKER_VERSION} else - apt-get install -qq -y lxc-docker + apt-get install -qq -y lxc-docker-1.6.2 endif sleep 2 # give docker a moment i guess endif From 74fa016bc18a08e968aac56f995623d133a98215 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 30 Jun 2015 16:59:37 -0400 Subject: [PATCH 3/3] Pin to 1.6.2 Refs #1263 [ci skip] --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 5a9b8a0e8..4aaa8d13c 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Version: 0.3.12 Section: base Priority: optional Architecture: amd64 -Depends: locales, git, make, curl, software-properties-common, lxc-docker (>= 1.4.0), lxc-docker (<= 1.6.2), gcc, python-software-properties, man-db, buildstep, sshcommand, pluginhook +Depends: locales, git, make, curl, software-properties-common, lxc-docker-1.6.2, gcc, python-software-properties, man-db, buildstep, sshcommand, pluginhook Pre-Depends: nginx, dnsutils, ruby, ruby-dev, rubygem-rack, rubygem-rack-protection, rubygem-sinatra, rubygem-tilt, apparmor, cgroup-lite Provides: dokku Maintainer: Jose Diaz-Gonzalez