github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-12-05 15:38:25 +00:00
Code Issues Projects Releases Wiki Activity
584 Commits 1 Branch 31 Tags
25b6f73f37f9582b98f3d27bf74b693a319357fb
Commit Graph

85 Commits

Author SHA1 Message Date
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
34b0d7dc1a docker: argument is now "--userland-proxy-path" 
This was changed from "--userland-proxy-bin" in response to review
feedback.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-04-29 14:56:36 +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
501301a849 Remove special case for insecure registry 
This is now in the daemon.json config file see
https://github.com/docker/pinata/issues/2771

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-26 14:17:16 +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
Justin Cormack
034fc7a5be 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
Rolf Neugebauer
e953d12e4e shutdown: use poweroff -f instead of halt -f 
This is makes fast shutdown work on Hyper-V

While at it, also clean up whitespaces. The file was mixed
tabs and spaces. Now it uses spaces.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-04-15 15:10:28 +01:00
David Scott
6c18dec743 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
a6fb594b44 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
4b0116ea07 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
bd0d295eaf 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
713af4332b clean up config options 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-11 11:09:55 +01:00
Justin Cormack
293a1eb23d change find to use keys, fix /etc/docker copying using find 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-08 14:03:43 +01:00
Justin Cormack
dba240e1f5 add insecure registry support 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-08 13:47:44 +01:00
Justin Cormack
32c895765f allow use of any files under /etc/docker eg /etc/docker/certs.d/ 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-08 13:28:15 +01:00
Justin Cormack
5847bb7eb1 more uses of moobyconfig in docker config 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-08 13:14:19 +01:00
Justin Cormack
64b16c1dc3 use mobyconfig some more in docker config 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-08 13:06:55 +01:00
Justin Cormack
99fb50d89f update to -rc4 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-07 09:55:57 +01:00
Justin Cormack
6b0b4e05cb remove 9pudc, unused and not being fixed 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-04 18:21:01 +01:00
David Scott
4f6641ff8c docker: if network=slirp or native/port-forwarding=true, forward ports 
Signed-off-by: David Scott <dave.scott@docker.com>
 2016-04-04 12:41:45 +01:00
David Scott
30bf58a223 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
c627c0e643 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
cedc6faa6e 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
73c6cb0593 fix typo in tar extract 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-04 12:13:45 +01:00
Justin Cormack
e851bacbd6 Increase p and n ulimits to match boot2docker, fixes #64 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-04 11:44:27 +01:00
Justin Cormack
d29278ba32 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
5057a0cc54 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
a187d2e5f4 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
4dec575407 switch root to a tmpfs filesystem, so pivot_root works, should make #57 work now 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-29 22:09:23 +01:00
Justin Cormack
43de87bed7 clean up log transfer 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-18 11:20:28 +00:00
Justin Cormack
f0ff62fbe2 fix typo properly 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-17 19:47:14 +00:00
Justin Cormack
c18749b761 typo 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-17 18:27:42 +00:00
Justin Cormack
65c187a0dd shift logs to host before docker startup, keep old logs 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-17 15:27:50 +00:00
Justin Cormack
c22d1f36a6 add log message for starting docker 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-17 14:28:55 +00:00
Justin Cormack
7bc1c77482 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
5d6f234057 fix docker pidfile, may resolve #44 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-11 11:52:24 +00:00
Justin Cormack
ae984a50a1 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
e003a56326 clean up docker init 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-04 11:50:28 +00:00
Justin Cormack
e9216cc716 Do not write ip address to database, no longer needed. 
See discussion in #39.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-04 10:43:01 +00:00
David Scott
076fcce176 Add debugging around writing the "ip" file 
If writing the "ip" file doesn't happen, this should show the reason
why.

Related to #39

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-03-01 09:21:28 +00:00
Justin Cormack
5dd093656f Revert "set debug mode on docker daemon" 
This reverts commit 52cce5311a.
 2016-02-24 16:18:47 +00:00
Justin Cormack
12389cd8cc set debug mode on docker daemon 
See https://github.com/docker/pinata/issues/827

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-24 14:24:58 +00:00
Justin Cormack
d0ec243663 update to 1.10.2 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-22 23:25:06 +00:00
Justin Cormack
d1081e6b6e output that we are shutting down docker 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-19 16:59:38 +00:00
Justin Cormack
f0afaf3074 #35 somewhat hacky patch for fast shutdown, just sync filesystems and halt after docker shutdown 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-19 14:53:23 +00:00
Justin Cormack
d054f4392d use driverDir not groupDir 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-18 11:19:52 +00:00
Dave Scott
fe94f5992a Merge pull request #31 from djs55/remove-driverDir 
Remove driverDir, use groupDir
 2016-02-17 15:52:21 +00:00
Justin Cormack
d23dada888 bind mount at docker start 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-02-17 14:17:40 +00:00
David Scott
5da9891c8b docker: write ip in groupDir, not driverDir 
Signed-off-by: David Scott <dave.scott@docker.com>
 2016-02-17 13:49:41 +00:00
Justin Cormack
2b959f22c6 Merge pull request #30 from djs55/avoid-socket9p 
Use IP rather than socket9p for the docker socket
 2016-02-15 15:15:25 +00:00