Commit Graph

46 Commits

Author SHA1 Message Date
Justin Cormack
0fe0d2a39b remove old arm docker binary, now releases are available upstream
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-02 16:50:35 +01:00
Justin Cormack
7981157503 Always copy in docker-proxy
Fix #434

Stupid mistake, sorry!

Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-08-26 09:18:15 +01:00
Justin Cormack
19c9e29783 List all docker binaries explicitly
This will make it fail correctly on old versions that are unsupported.

Allow override of download host.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-19 14:50:18 +01:00
Nathan LeClaire
49502493d3 Bump for Docker 1.12.1
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-08-18 10:49:07 -07:00
Justin Cormack
7fb834f850 Update docker to 1.12.1-rc2
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-17 11:28:21 +01:00
Justin Cormack
b42dd0570b Update to Docker 1.12.1-rc1
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-12 21:42:48 +01:00
Justin Cormack
4813ffe3cd Update docker to 1.12.0 final
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-28 00:43:12 +01:00
Justin Cormack
d8f9d6c0b7 Update Docker to 1.12.0-rc5
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-26 13:23:29 +01:00
Justin Cormack
c619fe5ec5 Support make flags for Docker version and experimental
Use `make DOCKER_VERSION=xxx` to override version. Note that
as install process and packaging may vary this may not work.

Use `make DOCKER_EXPERIMENTAL=0` to build from either release
binaries, if version is a final release or test binaries for
release candidates.

Building experimental is still the default.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-26 13:18:09 +01:00
Justin Cormack
261544cf02 update to 1.12.0-rc4 upstream version
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-13 09:50:25 +01:00
David Scott
1684b5585b Update docker to 1.12.0-rc3
Signed-off-by: David Scott <dave.scott@docker.com>
2016-07-04 11:04:29 +01:00
Ian Campbell
8fab3e5607 Avoid brace expansion which is a bashism.
Building on Debian where /bin/sh is dash:

make[1]: Leaving directory '/home/ijc/development/Docker/moby.git/alpine/packages/docker/docker.git'
mkdir -p bin
cp docker.git/bundles/latest/binary-daemon/{dockerd,docker-runc} bin/
cp: cannot stat 'docker.git/bundles/latest/binary-daemon/{dockerd,docker-runc}': No such file or directory
Makefile:9: recipe for target 'bin' failed

Pasting the construct into a file and running checkbashsisms:
possible bashism in foo line 2 (brace expansion):
cp docker.git/bundles/latest/binary-daemon/{dockerd,docker-runc} bin/

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-06-17 13:54:14 +01:00
Justin Cormack
f367ae62f5 Update to 1.12.0-rc2
Currently the repo points to just the cherrypicks, not yet final tag

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-06-17 13:24:44 +01:00
Justin Cormack
863fa5cb8e default to Docker experimental; later we will need to do multiple builds
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-06-15 10:28:26 +01:00
Justin Cormack
827eefcfa2 update docker to 1.12.0-rc1
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-06-15 10:19:31 +01:00
Justin Cormack
dd5fe0455b Update to docker 1.12-dev plus proxy patches, close to what will be rc1
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-06-14 14:13:36 +01:00
Justin Cormack
7e0f2bdfa7 Update docker to 1.11.2+patches
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-06-03 13:27:32 +01:00
Justin Cormack
25b6f73f37 clean docker.git
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-05-04 18:52:22 +01:00
David Scott
fd3c26feae Update docker to 1.11.1
Signed-off-by: David Scott <dave.scott@docker.com>
2016-04-29 14:00:45 +01:00
Justin Cormack
79e0a65f87 remove extra copy of docker that build adds
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-04-18 16:48:37 +01:00
Justin Cormack
034fc7a5be use (old) binary build of docker arm for now as no cross build yet
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-04-18 11:17:32 +01:00
David Scott
6c18dec743 docker: switch the branch to djs55/moby temporarily
Signed-off-by: David Scott <dave.scott@docker.com>
2016-04-13 22:50:40 +01:00
David Scott
a6fb594b44 Bump docker to 1.11.0 final
Signed-off-by: David Scott <dave.scott@docker.com>
2016-04-13 21:43:17 +01:00
Justin Cormack
4b0116ea07 bump to docker 1.11.0-rc5
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-04-12 10:28:25 +01:00
Justin Cormack
bd0d295eaf use docker git fork for our patches version, rather than having patches here, for more transparency
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-04-11 12:32:11 +01:00
Justin Cormack
99fb50d89f update to -rc4
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-04-07 09:55:57 +01:00
David Scott
30bf58a223 docker: add a patch to add --userland-proxy-bin argument
This will let us override the `docker-proxy` with the enhanced host
port-forwarding aware version.

Signed-off-by: David Scott <dave.scott@docker.com>
2016-04-04 12:41:45 +01:00
David Scott
c627c0e643 docker: compile from scratch rather than download binaries
A later patch will apply a non-upstream patch to docker.

Signed-off-by: David Scott <dave.scott@docker.com>
2016-04-04 12:41:45 +01:00
Justin Cormack
cedc6faa6e make tar more correct, by defining z
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-04-04 12:20:18 +01:00
Justin Cormack
73c6cb0593 fix typo in tar extract
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-04-04 12:13:45 +01:00
Justin Cormack
d29278ba32 clean up unpacking docker rc3 bundle
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-04-03 09:34:01 +01:00
Justin Cormack
5057a0cc54 update to docker 1.11.0-rc3
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-04-02 09:12:20 +01:00
Justin Cormack
a187d2e5f4 Support for 1.11.0-rc2, fix #57
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-03-31 18:54:05 +01:00
Justin Cormack
7bc1c77482 clean up download to make sure errors correctly
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-03-15 15:45:43 +00:00
Justin Cormack
ae984a50a1 update to docker 1.10.3
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-03-10 22:08:48 +00:00
Justin Cormack
d0ec243663 update to 1.10.2
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-22 23:25:06 +00:00
Justin Cormack
8720e79afa upgrade docker to 1.10.1
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-11 13:58:50 -08:00
Justin Cormack
e9dc319b85 update to docker 1.10.0
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-04 12:03:05 -08:00
Justin Cormack
d4ab304c67 update to rc4
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-03 17:38:17 -08:00
Justin Cormack
dd4ac33ced upgrade to 1.10.0-rc3
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-02 21:29:51 -08:00
Justin Cormack
59b2b66d8b upgrade to docker 1.10.0-rc2
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-01-28 23:26:29 +00:00
Justin Cormack
be8e321a59 upgrade to 1.10.0-rc1
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-01-16 20:59:22 +00:00
Justin Cormack
87dae6079b Initial arm support
Not yet working, some parts also not yet cross compiled

Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
2016-01-13 15:49:38 +00:00
Justin Cormack
6b60f08342 tidy curl
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
2016-01-11 12:17:38 +00:00
Justin Cormack
a35f04deff get docker from get.docker.com not from docker hub
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
2016-01-11 12:13:57 +00:00
Justin Cormack
6cce9a78e9 Use official docker image instead of Alpine package; switch to aufs by default
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
2015-12-18 14:13:34 +00:00