github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-12-07 20:41:04 +00:00
Code Issues Projects Releases Wiki Activity
1,364 Commits 1 Branch 31 Tags
588798404f2b901b6ae69c742f567bd75f8f41ef
Commit Graph

55 Commits

Author SHA1 Message Date
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
Justin Cormack
202cb42a84 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
54f6dcc44e 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
b17a1b7366 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
72861a6c88 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
269d61a849 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
9cc8e4a106 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
d5f0876276 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
baaa38bc4c 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
4544bbac58 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
759ad55f03 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
0e4c154bcf 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
f86f4bfae4 clean docker.git 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-04 18:52:22 +01:00
David Scott
ae3aec0522 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
2206cd8a30 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
b152e5f20f 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
29146734e5 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
4685b8af9e 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
0d45d82b7b 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
178f331c66 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
a6b0c50198 update to -rc4 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-07 09:55:57 +01:00
David Scott
1d66615bc4 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
96dd99326f 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
f4a21e4d1f 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
b58f06212d fix typo in tar extract 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-04 12:13:45 +01:00
Justin Cormack
fac0264ecf 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
1e0778657c 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
e891d65e97 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
11cf541e75 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
6973ce71f0 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
4462a4b88d update to 1.10.2 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-22 23:25:06 +00:00
Justin Cormack
b2871c2528 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
f7496850ce 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
747265770c update to rc4 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-03 17:38:17 -08:00
Justin Cormack
0859dd3d69 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
4d31dd28d3 upgrade to docker 1.10.0-rc2 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-01-28 23:26:29 +00:00