github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-12-07 23:18:43 +00:00
Code Issues Projects Releases Wiki Activity
1,185 Commits 1 Branch 31 Tags
e3082bcf2af3609296bcce84cc1be652f40bae50
Commit Graph

88 Commits

Author SHA1 Message Date
Justin Cormack
0dcd6641e1 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
cf6ce0c0a9 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
1e80ba4fe2 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
Justin Cormack
3f381afbfb Fix shared mount of /run 
Needs util-linux for now, see https://github.com/docker/moby/issues/424

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-22 23:04:57 +01:00
Justin Cormack
b6c9bd9b88 Create a systemd cgroups mountpoint 
This allows systemd based containers to "just work".

Fixes https://github.com/docker/pinata/issues/3126

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-10 14:27:17 +01:00
Justin Cormack
05610e7965 Allow longer for Docker to shut down 
Docker needs 10s at least for containers to be allowed to shut down,
so allow 15s maximum between SIGTERM and SIGKILL.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-28 17:25:49 +01:00
Justin Cormack
6973159dce On desktop editions, set default swarm advertise address to eth0 
This allows plain `swarm init` to work. We do not support multi
node clusters yet as there is no way to reqach this address from
externally at present.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-26 16:10:20 +01:00
Justin Cormack
3c8c48f459 Posixly correct = not == 
See #161 #170 should be covered...

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-20 12:33:01 +01:00
Justin Cormack
3d3b67d0c3 Add conditional services based on mobyplatform 
Replaces https://github.com/docker/moby/pull/282

Use mobyplatform=xxx to specify platform in boot command

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-18 12:39:14 +01:00
Justin Cormack
5b7ff1f6ef Wait for docker to finish starting up before terminateing init script 
This means dependent services can rely on docker being up.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 11:29:32 +01:00
Justin Cormack
9dad6b6467 set nofile ulimit to maximum possible value 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-13 14:04:49 +01:00
Rolf Neugebauer
f8c53db413 init: don't start docker on 0.0.0.0:2375 on DfM/DfW 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-07-12 14:08:55 +01:00
David Scott
dba37b747c /etc/init.d/docker: prepend /usr/local/sbin to the $PATH 
This is where the iptables wrapper lives.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-07-12 10:26:42 +01:00
David Sheets
11f965ce7b Remove /Mac in docker init and transfused init 
Replace /Mac with /host_docker_app and replace driverDir with just driver.

Signed-off-by: David Sheets <dsheets@docker.com>
 2016-07-08 14:36:26 -07:00
Justin Cormack
18b933e81b use cat not sysctl for reading sysctl values 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-04 15:47:46 +01:00
Justin Cormack
265ed43f21 Increase ulimits as high as possible 
Setting unlimited improves performance.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-04 14:37:28 +01:00
David Sheets
9d3e8ad516 docker init: remove fixed host export mounts 
Signed-off-by: David Sheets <dsheets@docker.com>
(cherry picked from commit 760840ac69)
 2016-07-02 12:27:09 -07:00
Ian Campbell
013599c78f Use "mkdir -p /run/log" in docker initfile 
For the "no error if existing" rather than "make parents" affect. Otherwise:

moby:~# service docker restart
 * Stopping docker
 * Starting Docker ...
mkdir: can't create directory '/run/log': File exists
 [ ok ]

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-06-17 13:57:33 +01:00
Justin Cormack
759ad55f03 Update to docker 1.12-dev plus proxy patches, close to what will be rc1 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-14 14:13:36 +01:00
Ian Campbell
c5940b3479 Bind the original /var/log onto /run/log 
So that it can be inspected while debugging.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-06-13 12:07:26 +01:00
Ian Campbell
a2ba682878 Use /proc/mounts in docker init script 
Switch one instance of /etc/mtab.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-06-13 12:07:26 +01:00
Justin Cormack
41f39f7efe missing /proc.mounts 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-13 10:40:10 +01:00
Justin Cormack
2efda11b65 remove transfused dependency from hostsettings by putting log mounts in docker startup 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-10 11:26:32 +01:00
Justin Cormack
5b4ebde5f7 remove special treatment of /etc/docker/daemon.conf as we no longer have a watch on it 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-08 13:47:09 +01:00
Ian Campbell
de6e7f9cbe Point chronyd at gateway when ntp=gateway is given on the kernel cmdline. 
Reconfigure chronyd in a udhcpc post-bound hook and restart it, but use
conditionalrestart so it is not started if it isn't running, which is the case
during boot when this hook happens from init.d/networking via ifup, running
"service ... start" in that context results in the daemon running but the
service db saying it isn't.

Doing it in the udhcpc hook leaves a nice hole where support for getting the
NTP server via DHCP can fit in once it is available.

This also switches from using "initstepslew" to "makestep", the former was
responsible for the long delay starting chronyd (meaning we can now drop
"before chronyd" from Docker's init dependencies), while the later will force a
step if the time is out by more than the configured amount (half a second
here), meaning it will be corrected on resume. The rest of the time it chrony
will do the usual slewing to keep the clock accurate. Passing -1 as the limit
to "makestep" ensures the step will always occur, if it were positive it would
only be done that number of times.

We add "iburst" and "minpoll 2" to the default configuration file to speed up
initial sync and resync after sleep respectively, resync after sleep happens in
a couple of seconds. In "ntp=gateway" mode we also patch in "trust", this isn't
in the default config file since we won't be so sure about DHCP provided
servers, but when talking to a host provided NTP we want to use its time (for
sync accross host mounts) even if it has a crazy idea about what the time is.

With this we can also remove the 15min ntp sync, which in turn gets rid of the
need for cron.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-06-08 13:19:35 +01:00
Justin Cormack
1fab4151ef 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
Magnus Skjegstad
9c5aee352d also bindmount /tmp once 
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
 2016-06-03 01:44:11 +01:00
Justin Cormack
2c6ba517e9 fix typo 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-02 13:56:20 +01:00
Justin Cormack
e94dff4d11 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
3f513f2368 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
50bb644acb 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
3a02f608d5 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
fc370b0c21 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
382f99529d 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
a326a8b5ab 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
7d7ff562a7 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
242a505bc1 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
b76032f9fe clean up config options 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-11 11:09:55 +01:00
Justin Cormack
43c22fcffa 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
167123a363 add insecure registry support 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-04-08 13:47:44 +01:00
Justin Cormack
885cdd15f9 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
6859c551ee 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
6b396e200c 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
09a98bf3e2 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
edcf29c5e4 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
249151a445 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
6d890f007b 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
5fc48fbf70 clean up log transfer 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-18 11:20:28 +00:00
Justin Cormack
33d6a8adf0 fix typo properly 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-17 19:47:14 +00:00
Justin Cormack
2c172c040b typo 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-17 18:27:42 +00:00