github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-12-26 19:38:45 +00:00
Code Issues Projects Releases Wiki Activity
643 Commits 1 Branch 31 Tags
4fa937d11de7b330cac20a37684dfdc3a113c156
Commit Graph

57 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
David Scott
9c5470ca87 Use IP rather than socket9p for the docker socket 
Before this patch, docker would only listen on 0.0.0.0:2375 if running
on Hyper-V. This patch makes it listen there on all hypervisors.

In the case of xhyve, it will listen on the host internal vmnet network
or the virtual slirp network. We should aim to replace this with a socket-
based transport instead.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-02-15 15:10:20 +00:00
David Sheets
192c90b0a7 Replace 9pudfuse with transfused 2016-02-12 14:07:43 +00:00
Rolf Neugebauer
7f7abf722e docker: also listen to local unix socket when running on Hyper-V 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-02-05 16:57:47 -08:00
David Sheets
48a8bc87f6 Fix the docker.log output filename 2016-02-04 11:04:18 +00:00
Rolf Neugebauer
d89031ec6f docker: start docker daemon with network on Hyper-V for now 
On Windows, for now we use DOCKER_HOST and access the docker daemon
on Moby via the network.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-01-28 13:52:24 -08:00
Justin Cormack
c5525c8a7a add a script to move all logs to host 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-01-27 13:36:36 +00:00
Justin Cormack
78bd5af1ac run docker after 9p fuse 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-01-27 13:20:45 +00:00
Justin Cormack
849df72fb5 do not set graph driver in moby, use default or get from daemon.json config 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-01-26 12:35:46 +00:00
Justin Cormack
bfa1720456 force overlay for now, until -rc2 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-01-22 12:18:15 +00:00
Justin Cormack
1ea4bc9cd1 remove customisation options as we will need to access pidfile elsewhere 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-01-21 17:16:17 +00:00
Justin Cormack
af8742eaaf fix config file 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2016-01-20 16:58:25 +00:00
Justin Cormack
4aeee48189 fix elif 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2016-01-20 16:57:47 +00:00
Justin Cormack
0261d732e4 some logic to choose graph driver, not just go with aufs 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2016-01-20 14:49:30 +00:00
Justin Cormack
77a5b0d032 Use a config file from the database if present 
See issue https://github.com/docker/pinata/issues/690

Note there is not yet a restart mechanism.

Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2016-01-20 14:40:45 +00:00
Justin Cormack
a31db284e3 fix docker log output 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2016-01-15 16:44:33 +00:00
Justin Cormack
7be084d189 move docker logs to host, see #447. Syslog still local 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2016-01-15 15:20:04 +00:00