github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-12-07 09:49:35 +00:00
Code Issues Projects Releases Wiki Activity
704 Commits 1 Branch 31 Tags
5d80b5dfcdb8e04f3c9aa59634fb13645c18b39c
Commit Graph

95 Commits

Author SHA1 Message Date
Justin Cormack
5d80b5dfcd fix #169 only do /tmp bind mount if /Mac/tmp exists 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-03 15:15:20 +01:00
Justin Cormack
7e0f2bdfa7 Update docker to 1.11.2+patches 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-03 13:27:32 +01:00
Magnus Skjegstad
420f92d3fa also bindmount /tmp once 
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
 2016-06-03 01:44:11 +01:00
Justin Cormack
5832819473 fix typo 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-02 13:56:20 +01:00
Justin Cormack
35cdbaf458 avoid rebindmounting directories on docker restart 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-02 13:18:27 +01:00
Justin Cormack
a597292272 move log mount to hostsettings not docker startup 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-27 11:41:46 -07:00
Justin Cormack
4f7f9cd2fa Do not try to keep log files, fix #154 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-26 14:24:05 -07:00
Dave Tucker
7318e24b87 Set proxy setting in Docker init script 
Signed-off-by: Dave Tucker <dt@docker.com>
 2016-05-16 12:07:01 +01:00
Justin Cormack
952bb2d3db Revert "replace chronyd with sntpc, sync every 15s not 15m" 
We should not use ntp.org this frequently, need to work out something
that uses host time mainly.

This reverts commit 382f99529d.
 2016-05-10 11:29:16 +01:00
Justin Cormack
32ddaae7a5 replace chronyd with sntpc, sync every 15s not 15m 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-05-10 11:00:51 +01:00
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