Commit Graph

90 Commits

Author SHA1 Message Date
Justin Cormack
eed645d7e0 Remove ability to pull docker from hub
We never used this as updates too slow and out of our control.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-28 14:22:30 -08:00
Justin Cormack
4cbb9f27d6 Merge pull request #1217 from FrenchBen/handle-bundles
Added support for bundles generated from CI
2017-02-28 13:37:47 -08:00
Justin Cormack
61291f0685 Upgrade to Docker 17.03.0-ce
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-28 12:59:52 -08:00
French Ben
b15b5326b4 Fixed docker version
Signed-off-by: French Ben <frenchben@docker.com>
2017-02-27 17:01:58 -08:00
French Ben
a9849e776a Added bundle detection
Signed-off-by: French Ben <frenchben@docker.com>
2017-02-27 16:19:29 -08:00
French Ben
924c0da2d2 Removed extra line
Signed-off-by: French Ben <frenchben@docker.com>
2017-02-27 15:45:15 -08:00
French Ben
0263896388 Removed unneeded var
Signed-off-by: French Ben <frenchben@docker.com>
2017-02-27 14:26:44 -08:00
French Ben
57c609f700 Flexible docker version
Signed-off-by: French Ben <frenchben@docker.com>
2017-02-27 14:25:43 -08:00
French Ben
269e2c8157 Added support for bundles generated from CI
Signed-off-by: French Ben <frenchben@docker.com>
2017-02-27 14:25:43 -08:00
Robb Kistler
e0269e0978 Allow docker engine to be pulled from s3 bucket
Use aws cli to pull docker engine binaries from s3 bucket.  Conditional and
happens if DOCKER_BIN_URL begins with 's3://'

Example usage:
```
  export AWS_ACCESS_KEY_ID=key
  export AWS_SECRET_ACCESS_KEY=secret
  make DOCKER_BIN_URL=s3://path-to-engine-binaries
```
Signed-off-by: Robb Kistler <robb.kistler@docker.com>

Signed-off-by: Robb Kistler <robb.kistler@docker.com>
2017-02-23 20:32:00 -08:00
French Ben
816ce62ad5 Added quotes for curling
Signed-off-by: French Ben <frenchben@docker.com>
2017-02-23 15:15:28 -08:00
Justin Cormack
e0db9f1074 Update Docker to 17.03.0-ce-rc1
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-20 10:52:41 +00:00
Justin Cormack
533a8d48fe Update Docker to 1.13.1
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-08 09:34:57 +00:00
Riyaz Faizullabhoy
48ab5cdc82 1.13.1-rc2 docker bump
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-02-02 09:33:46 -08:00
Justin Cormack
94c3564c44 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
66348fda2a 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
8c1581bc39 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
f419265794 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
16b941fb68 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
76d376f7cc 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
7471ecc9ec 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
5503a0c966 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
49a2fc6017 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
8ccb1bfdb3 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
8d7957951c 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
040d6faeab 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
00ee4be2b5 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
c758ca67ce make curl fail on 404
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-01 13:58:02 +00:00
Justin Cormack
30dff6a0f4 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
a25973608e 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
f625a63084 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
0b41443ae3 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
be7fcd72f4 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
71ec0982ce 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
8106f7a174 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
64fd8d7a5c 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
09ad0a2aa2 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
3bb527c6bb 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
c001ded03b 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
a1f78bf3c9 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
bba6934f22 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
b1597ff9a9 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
02a76828be clean up docker Makefile
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-09-12 16:00:53 +01:00
Ken Cochrane
e3082bcf2a 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
97ef6ccf2a 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
bfcfb7c3a4 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
1dd45af6ce 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
794af5ea3e 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
2245476095 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
832b290a2b Update to Docker 1.12.1-rc1
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-12 21:42:48 +01:00