github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2026-01-14 18:04:20 +00:00
Code Issues Projects Releases Wiki Activity
1,972 Commits 1 Branch 31 Tags
aaa2e30a7529044be622f0b453dc6bf5b5843663
Commit Graph

182 Commits

Author SHA1 Message Date
Justin Cormack
848ba2bb71 Do not try to use aufs if kernel has no support 
This happens with the Moby mainline kernel and in future when we drop aufs.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-01-20 15:36:51 +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
David Gageot
a54f2ae179 Specific init.d script for GCP 
Signed-off-by: David Gageot <david@gageot.net>
 2016-12-23 12:03:20 +01:00
Justin Cormack
705632ff66 Support Docker 1.12 on OSX 
I had occasion to use a Moby build of 1.12 on Docker for Mac today
and I had to patch this in. Given that we re-added support for 1.12
for cloud, for CS, may as well support on OSX too as we are still
doing releases.

The fix is a bit messy (hence the flag), as it writes to the file
system but we will remove it later, or work around the write if
we need to continue to support 1.12 outside the 1.12.x branch.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-12-17 00:02:45 -08: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
7403c94ef4 Only default to experimental if dockerd supports it 
This allows 1.12 engine to still be supported on master.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-12-13 14:45:13 -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
Nathan LeClaire
82d92fd11b Merge pull request #746 from justincormack/no-2375 
Stop Docker listening on port 2375
 2016-12-05 13:43:36 -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
59353f78c0 Update Docker init script for 1.13 
- never update root filesystem see #583
- remove tests for earlier docker versions
- only use iptables override on desktop

fix #753

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-21 21:15:24 +00:00
Justin Cormack
f69f9a3427 Use syslog local0 for docker logs 
This allows log rotation, redirect via syslog etc.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-18 16:23:41 +00:00
Justin Cormack
2759c51105 Merge pull request #743 from justincormack/no-bind-log 
Do not try to bind mount logs onto host on osx
 2016-11-18 10:43:50 +00:00
Justin Cormack
2e4ee1a73f Default to experimental if not specified in daemon.json 
Most editions were shipping with experimental; now it is a daemon
flag this seems the best behaviour.

Only do this on recent dockerd as we are still supporting 1.12 for
a while longer.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-17 20:46:44 +00:00
Justin Cormack
7701e2b156 Stop Docker listening on port 2375 
This is a huge security hole, remove from Moby.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-16 21:55:42 +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
66c03d8cd5 Do not try to bind mount logs onto host on osx 
This is not working well, and was binding over the logs, and losing
logs. We need a uniform approach on all platforms, planned to be
syslog.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-16 16:08:03 +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
3cead2d813 Increase default memlock ulimit 
Fix #610

Users can override, but the default is low.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-10-14 11:27:45 +01:00
Justin Cormack
11125429f3 Default to overlay2 
If there is no storage-driver set in daemon.json and no
aufs directory in the docker directory, use overlay2 as the storage
driver.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-10-13 16:08:20 +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
ce6ae3a70b fix checking for debug key exists 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-09-26 22:24:48 +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
9a96f5da8c Add support for running a development bundle of Docker 
Add a database key `bundle` that contains a path to a Docker dev
bundle eg `/.../docker/bundles/1.13.0-dev` where the docker
binaries to run can be found. This will be paired with a script
in `docker/docker` to set this key, so users can easily help
contribute to Docker development.

The change will be permanent until the key is removed or a factory
reset is done, or the bundle cannot be found.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-09-13 22:46:27 +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
b392bf0a2e Simplify kernel output and main Dockerfile 
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2016-09-12 16:02:07 +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
b0f3012993 Run dockerd in debug mode if not overridden in config file 
Fix #448

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-31 12:29:23 +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
2ed6616195 Remove hacky code for fast shutdown 
Shutdown without this still seems pretty quick, and we are no longer
shutting down frequently for state changes, so I think this is a
reasonable change.

See #430

Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2016-08-24 00:24:02 +01:00
Justin Cormack
e534f613ca Resolved how to get busybox to created shared mounts 
Not documented...

Removed util-linux again.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-23 00:17:08 +01:00