Commit Graph

76 Commits

Author SHA1 Message Date
Justin Cormack
25c357b375 Update to Docker 1.13.1-rc1
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-28 10:16:15 +00:00
Justin Cormack
36df13e1ef Update Docker to 1.13.0
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-18 16:14:17 +00:00
Justin Cormack
7982de1545 Update Docker to 1.13.0-rc7
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-13 21:48:21 +00:00
Justin Cormack
41fabe9e1a Update Docker engine to 1.13.0-rc6
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-11 22:26:22 +00:00
Justin Cormack
c2754ed49e Update docker to 1.13.0-rc5
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-05 09:28:02 +00:00
Justin Cormack
5f625a6889 Add a build flag to build from master
This donwloads from master.dockerproject.org and fixes up the
different URL structure.

Use `make DOCKER_VERSION=master`

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-12-28 18:33:29 +00:00
Justin Cormack
158924114a Update Docker to 1.13.0-rc4
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-12-16 21:40:38 -08:00
Justin Cormack
6d8925f012 Update Docker to 1.13.0-rc3
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-12-05 20:31:16 -08:00
Riyaz Faizullabhoy
4068e792fd Use DCT in library run command
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-12-01 09:27:01 -08:00
Justin Cormack
997550c1a2 Remove last references to EXPERIMENTAL
Only support 1.13 now, experimental is a runtime flag.

see #647

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-24 13:37:07 +00:00
Justin Cormack
32253f83da Update to Docker 1.13.0-rc2
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-23 21:40:23 +00:00
Justin Cormack
d45bf3d89b upgrade Docker to 1.13.0-rc1
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-16 16:48:26 +00:00
Justin Cormack
b356364777 remove completion directory from newer docker downloads
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-14 11:00:28 +00:00
Justin Cormack
50a64ac6c4 make curl fail on 404
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-01 13:58:02 +00:00
Justin Cormack
cc903c3fa5 Add dependency to Makefile for Docker
The Docker version is in the Makefile su always re-upload if changed.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-27 11:29:31 +01:00
Justin Cormack
e08b05b0ad update Docker to 1.12.3
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-27 09:14:20 +01:00
Justin Cormack
5f4d354b10 Update to docker 1.12.3-rc1
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-25 10:06:52 +01:00
Justin Cormack
d48e655cdd remove temporary force curl before hub updated
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-14 21:58:30 +01:00
Justin Cormack
fa268fbdf3 temporarily force curl as image not yet available
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-12 00:48:18 +01:00
Justin Cormack
9b0f64044a Update Docker to 1.12.2
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-11 19:26:45 +01:00
Justin Cormack
2e67fa91b7 Make the Docker download more robust to pipefail errors
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-11 19:26:45 +01:00
Justin Cormack
cbf40afd8b Update docker to 1.12.2-rc3
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-08 13:00:15 +02:00
Justin Cormack
35b58b9290 update Docker to 1.12.2-rc1
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-28 08:51:07 +01:00
Justin Cormack
0d08098b09 Fix code for downloading Docker for release candidates
These always need to be downloaded with curl.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-27 22:26:29 +01:00
Justin Cormack
69beeca467 Copy docker-init if present
Fix #552

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-23 18:11:05 +01:00
Justin Cormack
5e4e7d1c7f rm docker container used for binary extraction
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-12 16:37:24 +01:00
Justin Cormack
cd6507f1d0 for release docker binaries we can fetch from docker hub rather than curl, so will be cached
Allow override in case docker images not released

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-12 16:36:01 +01:00
Justin Cormack
276157a769 Move all output to the directories it will be in eventually
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 16:02:07 +01:00
Justin Cormack
98beff2fa0 clean up docker Makefile
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 16:00:53 +01:00
Ken Cochrane
171f0e9fe5 Add ability to pass url to docker binaries
Signed-off-by: Ken Cochrane <KenCochrane@gmail.com>
2016-09-12 10:55:09 -04:00
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