github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-08-01 06:58:56 +00:00
Code Issues Projects Releases Wiki Activity
824 Commits 1 Branch 27 Tags 240 MiB
4753104be4
Commit Graph

824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave Scott
4753104be4 Merge pull request #235 from djs55/docker.1.12-rc3.rc 
Update docker to rc of rc3
 2016-07-01 13:48:15 +01:00
David Scott
934ad0218e Update docker to rc of rc3 
4949c95ba31f34f9883480261873208f21d5b29e at https://github.com/tiborvass/docker/commits/bump_v1.12.0

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-07-01 13:44:04 +01:00
Magnus Skjegstad
9c6ba15c06 Merge pull request #231 from MagnusS/pinata-ga-upgrade-to-kernel-4.4.14 
Upgrade to kernel 4.4.14 in pinata-ga branch
 2016-06-29 10:14:23 +01:00
Justin Cormack
958218b919 update linux to 4.4.14 and update aufs to 20160627 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
(cherry picked from commit 1d22f68e87)
 2016-06-29 10:08:19 +01:00
Rolf Neugebauer
65e463b8cb Merge pull request #229 from rneugeba/no-console 
Don't start getty on console
 2016-06-28 12:47:59 +02:00
Rolf Neugebauer
1627bfbc46 Don't start getty on console 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-06-28 09:56:47 +02:00
Rolf Neugebauer
b00ff7b58d diag: improve diagnostics 
- try several wget's on well known IP addresses to check IP
  connectivity (ping in hostnet mode is not good enough)
- try DNS lookup on a well known server
- add service-port-opener logs

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
(cherry picked from commit 72fd755473)
 2016-06-22 11:59:51 +01:00
Rolf Neugebauer
05084ae797 win: ensure that the KVP daemon starts early 
The Windows start script polls the VM for it's IP address before
initiating things like CIFS mounts.  Getting the IP config is
done via the KVP daemon.  Starting it earlier reduce the start up
delay, in particular if the VM is part of a swarm.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
(cherry picked from commit 082c10d997)
 2016-06-22 10:28:28 +01:00
Dave Scott
44ef942a08 Merge pull request #222 from djs55/iptables 
Add an iptables wrapper which runs the userland proxy
 2016-06-17 18:18:59 +01:00
David Scott
e898659431 iptables: log to /var/log/... rather than /var/run/log 
Signed-off-by: David Scott <dave.scott@docker.com>
 2016-06-17 18:07:03 +01:00
David Scott
9115ca75a6 iptables: only open host ports if native/port-forwarding=true in the db 
Signed-off-by: David Scott <dave.scott@docker.com>
 2016-06-17 18:07:03 +01:00
David Scott
068f5d6790 iptables: add a TODO 
Signed-off-by: David Scott <dave.scott@docker.com>
 2016-06-17 18:07:03 +01:00
David Scott
cc34c64022 iptables: remove the pid file after sending SIGTERM 
Signed-off-by: David Scott <dave.scott@docker.com>
 2016-06-17 18:07:03 +01:00
David Scott
b940bf57ce proxy: add a -no-local-ip option 
docker itself seems to bind to the port globally inside Moby, so we
get an EADDRINUSE if we try to do it too.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-06-17 18:07:03 +01:00
David Scott
02eeb53deb iptables: get the kill arguments the right way round 
Signed-off-by: David Scott <dave.scott@docker.com>
 2016-06-17 18:07:03 +01:00
David Scott
bd90ff4c9d iptables: close all the fds we inherit from docker 
Signed-off-by: David Scott <dave.scott@docker.com>
 2016-06-17 18:07:03 +01:00
David Scott
530e61178b /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-06-17 18:07:02 +01:00
David Scott
8311a37ff6 Add primitive iptables wrapper which can set up port forwards 
Signed-off-by: David Scott <dave.scott@docker.com>
 2016-06-17 18:07:02 +01:00
Ian Campbell
d118b588c5 Simple build system for ocaml-based iptables 
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-06-17 18:07:02 +01:00
Justin Cormack
74a7622ee3 Merge pull request #220 from dhiltgen/console 
Add SATA disk support
 2016-06-17 16:16:46 +01:00
Daniel Hiltgen
3479c8b3ac Add SATA disk support 
Increase the number of hypervisors where Moby can run and detect
the disks.  With this change, I'm able to boot under KVM and see
the disk detected, formatted and mounted as expected.
 2016-06-17 08:11:46 -07:00
Justin Cormack
2d67ea5cb8 Merge pull request #218 from ijc25/mkdir-p 
Use "mkdir -p /run/log" in docker initfile
 2016-06-17 14:03:14 +01:00
Justin Cormack
ff82e8fc89 Merge pull request #217 from ijc25/bashisms 
Avoid brace expansion which is a bashism.
 2016-06-17 14:02:57 +01: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
Ian Campbell
9cc8e4a106 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
a9d32026cf Merge pull request #216 from justincormack/docker-1.12.0-rc2 
Update to 1.12.0-rc2
 2016-06-17 13:25:50 +01:00
Justin Cormack
d5f0876276 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
f1093538d8 Merge pull request #215 from djs55/proxy-arg 
proxy: add interactive mode with `-i`
 2016-06-17 11:59:18 +01:00
David Scott
45bb435b51 proxy: add interactive mode with -i 
This allows the proxy to be run easily from a terminal or other script
without requiring fd 3 to be open and writable.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-06-17 11:11:10 +01:00
Justin Cormack
d01628a5b8 Merge pull request #214 from dhiltgen/console 
Add support for console on tty1
 2016-06-17 01:39:41 +01:00
Daniel Hiltgen
52b43e9482 Add support for console on tty1 
When running moby under other hypervisors, requiring troubleshooting on
the serial port can be painful.  This change enables console support on
tty1 similar to the way prior boot2docker images worked.
 2016-06-16 17:17:34 -07:00
Justin Cormack
897ca50c40 Merge pull request #213 from justincormack/chronylisten 
fix #212 do not let chronyd listen on a port for commands
 2016-06-15 15:28:53 +01:00
Justin Cormack
a6819a65ba fix #212 do not let chronyd listen on a port for commands 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-15 15:28:05 +01:00
Justin Cormack
e244acccd4 Merge pull request #211 from justincormack/docker-1.12.0-rc1 
Docker 1.12.0 rc1
 2016-06-15 10:43:41 +01:00
Justin Cormack
b70b51af18 reverse on Windows check for diagnostics 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-15 10:42:21 +01:00
Justin Cormack
baaa38bc4c 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
4544bbac58 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
c47e0cf4ad Merge pull request #210 from justincormack/cdrom 
Kernel config for CDROM support (for Azure)
 2016-06-14 22:09:36 +01:00
Justin Cormack
2ac1a31db1 Merge pull request #209 from djs55/fix-tap-vsockd 
tap-vsockd: make sure the service daemonizes properly
 2016-06-14 15:49:37 +01:00
David Scott
abe75e4e50 tap-vsockd: make sure the service daemonizes properly 
This tells start-stop-daemon to run tap-vsockd as a daemon, and tells
tap-vsockd not to daemonize itself. This seems to work more reliably
than when tap-vsockd self-daemonizes.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-06-14 15:16:56 +01:00
Justin Cormack
77887c4bec Merge pull request #208 from justincormack/1.12-dev 
Update to docker 1.12-dev plus proxy patches, close to what will be rc1
 2016-06-14 14:15:19 +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
Justin Cormack
7a9320b931 Kernel config for CDROM support (for Azure) 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-14 11:30:47 +01:00
Justin Cormack
d99deeb003 Merge pull request #206 from justincormack/openssl 
add openssl for wget helper
 2016-06-13 17:27:22 +01:00
Justin Cormack
f4f41efe09 add openssl for wget helper 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-13 17:26:29 +01:00
Justin Cormack
8b4ca18b10 Merge pull request #205 from justincormack/criu 
Add CRIU support
 2016-06-13 16:41:43 +01:00
Justin Cormack
3bd4a67fd7 Add CRIU support 
Also enables expert so a bunch of other options showing

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-13 16:33:31 +01:00
Justin Cormack
a5e72ac917 Merge pull request #204 from justincormack/kernelup 
update kernel to 4.4.13 and aufs to 20160613
 2016-06-13 15:14:20 +01:00
Justin Cormack
50536e6aa7 update kernel to 4.4.13 and aufs to 20160613 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-13 15:06:25 +01:00
Justin Cormack
7d73182c45 Merge pull request #196 from rneugeba/win-proxy-fix 
proxy: fix handling of CloseRead/CloseWrite for TCP port proxy
 2016-06-13 14:22:30 +01:00