github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2026-04-06 00:17:46 +00:00
Code Issues Projects Releases Wiki Activity
2,176 Commits 1 Branch 32 Tags
175daffe7102bb3af6cbfc6548594efcc2632304
Commit Graph

200 Commits

Author SHA1 Message Date
Justin Cormack
a18c3d4c0a 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
edb48c0a13 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
54decb3626 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
66710a38a2 Fixed docker version 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-02-27 17:01:58 -08:00
French Ben
8d0197d403 Added bundle detection 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-02-27 16:19:29 -08:00
French Ben
a76ddbc51d Removed extra line 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-02-27 15:45:15 -08:00
French Ben
efde709ed5 Removed unneeded var 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-02-27 14:26:44 -08:00
French Ben
6752ad5511 Flexible docker version 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-02-27 14:25:43 -08:00
French Ben
10bd1e526d 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
b2b585ac99 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
a118ce4f05 Added quotes for curling 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-02-23 15:15:28 -08:00
Justin Cormack
457c173849 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
155676ee21 Do not try to run metrics proxy when not configured 
Failure test case was not correct; printed a (harmless) error message
that was confusing.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-09 13:58:03 +00:00
Justin Cormack
5256eb0263 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
83b9afce02 Merge pull request #1144 from riyazdf/1.13.1-rc2-bump 
1.13.1-rc2 docker bump
 2017-02-06 21:50:35 -08:00
Riyaz Faizullabhoy
4fe7784ad1 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
7327d374ec Forward Prometheus metrics to host if enabled 
Set your daemon.json to something like:
```
{
	"experimental": true,
	"metrics-addr": "0.0.0.0:4999"
}
```

and your metrics will be at `localhost:4999/metrics`

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-02 11:51:24 +00:00
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
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