github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-12-05 14:09:51 +00:00
Code Issues Projects Releases Wiki Activity
789 Commits 1 Branch 31 Tags
01ecbd25e8a9ab66b96308c3714daf07392e669d
Commit Graph

108 Commits

Author SHA1 Message Date
Justin Cormack
01ecbd25e8 Merge pull request #218 from ijc25/mkdir-p 
Use "mkdir -p /run/log" in docker initfile
 2016-06-17 14:03:14 +01:00
Ian Campbell
e84371fc9c 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
Ian Campbell
8fab3e5607 Avoid brace expansion which is a bashism. 
Building on Debian where /bin/sh is dash:

make[1]: Leaving directory '/home/ijc/development/Docker/moby.git/alpine/packages/docker/docker.git'
mkdir -p bin
cp docker.git/bundles/latest/binary-daemon/{dockerd,docker-runc} bin/
cp: cannot stat 'docker.git/bundles/latest/binary-daemon/{dockerd,docker-runc}': No such file or directory
Makefile:9: recipe for target 'bin' failed

Pasting the construct into a file and running checkbashsisms:
possible bashism in foo line 2 (brace expansion):
cp docker.git/bundles/latest/binary-daemon/{dockerd,docker-runc} bin/

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-06-17 13:54:14 +01:00
Justin Cormack
f367ae62f5 Update to 1.12.0-rc2 
Currently the repo points to just the cherrypicks, not yet final tag

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-17 13:24:44 +01:00
Justin Cormack
863fa5cb8e default to Docker experimental; later we will need to do multiple builds 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-15 10:28:26 +01:00
Justin Cormack
827eefcfa2 update docker to 1.12.0-rc1 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-15 10:19:31 +01:00
Justin Cormack
dd5fe0455b 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
a0f2582aba 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
4d4ea240a8 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
cb827b9521 missing /proc.mounts 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-13 10:40:10 +01:00
Justin Cormack
31c5b24513 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
30eeba673a 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
d1e5ba6121 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
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