github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-31 22:47:12 +00:00
Code Issues Projects Releases Wiki Activity
814 Commits 1 Branch 27 Tags 240 MiB
f2b432053c
Commit Graph

814 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ian Campbell
f2b432053c diagnostics: run "gofmt -w" over go code 
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-07-01 15:35:26 +01:00
Justin Cormack
8b99d0c026 Merge pull request #228 from justincormack/kernelup 
update linux to 4.4.14 and update aufs to 20160627
 2016-06-26 16:17:48 -07:00
Justin Cormack
1d22f68e87 update linux to 4.4.14 and update aufs to 20160627 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-26 16:16:57 -07:00
Rolf Neugebauer
144c643c05 Merge pull request #227 from rneugeba/diag-improv 
diag: improve diagnostics
 2016-06-22 11:58:42 +01:00
Rolf Neugebauer
72fd755473 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>
 2016-06-22 11:38:51 +01:00
Justin Cormack
35669c7a29 Merge pull request #226 from rneugeba/kvp-earlier 
win: ensure that the KVP daemon starts early
 2016-06-21 15:46:53 -07:00
Rolf Neugebauer
082c10d997 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>
 2016-06-21 14:19:59 +01:00
Justin Cormack
e130ef839e Merge pull request #223 from justincormack/qemufix 
Make the qemu containers interactive so the console works
 2016-06-19 17:00:17 +01:00
Justin Cormack
8777d775ed Make the qemu containers interactive so the console works 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-18 21:47:31 +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
Justin Cormack
b99befab17 Merge pull request #201 from ijc25/bind-aside-original-var-log 
Bind aside original var log
 2016-06-13 14:22:22 +01:00
Justin Cormack
0ac2c6eb5c Merge pull request #203 from justincormack/deps 
Revert "start automount after syslog as it tries to restart it"
 2016-06-13 14:22:02 +01:00
Justin Cormack
96ab15bc4b Revert "start automount after syslog as it tries to restart it" 
This reverts commit 8276becaf1.
 2016-06-13 14:18:05 +01:00
Justin Cormack
05537f511c Merge pull request #202 from justincormack/nosyslogrestart 
remove syslog restart from setup-disk
 2016-06-13 13:44:55 +01:00
Justin Cormack
96d0225bbf remove syslog restart from setup-disk 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-13 13:44:06 +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
9fe395c180 Merge pull request #200 from justincormack/runlevels 
Fix startup issues
 2016-06-13 11:51:33 +01:00
Justin Cormack
8276becaf1 start automount after syslog as it tries to restart it 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-13 11:51:03 +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