Commit Graph

8512 Commits

Author SHA1 Message Date
Justin Cormack
c9ba063c7d somehow networking is resetting hostname, get mdnstool to fix for now
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-03-01 16:50:30 +00:00
Justin Cormack
be2612bfd8 do not set hostname in dhcp
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-03-01 14:57:11 +00:00
Justin Cormack
3ff1aed545 Merge pull request #40 from djs55/add-ip-debug
Add debugging around writing the "ip" file
2016-03-01 09:28:00 +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
928667ca57 clean up transfused startup scripts
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-26 13:46:26 +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
d0ec243663 update to 1.10.2
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-22 23:25:06 +00:00
Justin Cormack
11e0140e24 update kernel to 4.1.18
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-22 16:48:54 +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
df03c55e95 add a qemu iso target
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-19 16:11:23 +00:00
Justin Cormack
ee7b04356b use volume for building iso
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-19 16:11:09 +00:00
Justin Cormack
42e85b9776 Merge pull request #36 from dave-tucker/dtb
Clean up ARM builds
2016-02-19 15:15:27 +00:00
Dave Tucker
2b5b1e64fa Clean up ARM builds
- Check in dtbs and give them their own directory
- Add cubieboard dtbs :)
- Remove hyper-v tools from arm Dockerfile

Signed-off-by: Dave Tucker <dt@docker.com>
2016-02-19 14:59:55 +00:00
Justin Cormack
4fe3de4bbb more RAM
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-19 14:59:27 +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
64ff2d2b15 use a volume for the initrd image
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-19 14:52:23 +00:00
Justin Cormack
9669cd10e1 shift rest of these to using compose
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-18 15:35:35 +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
Justin Cormack
365d2744d6 Merge pull request #32 from dave-tucker/armfix
Fix ARM Builds
2016-02-17 18:09:30 +00:00
Dave Tucker
c26bfdc275 Fix ARM Builds
Signed-off-by: Dave Tucker <dt@docker.com>
2016-02-17 17:59:21 +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
e2659a8131 remove bind mounts from 9pinit
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-17 14:22:55 +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
Justin Cormack
4980c1a80e typo
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-17 14:11:13 +00:00
Justin Cormack
41c1689ab4 also bind mount when using fuse
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-17 13:56:08 +00:00
Justin Cormack
4945353da3 start using docker compose for build
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-17 13:53:27 +00:00
David Scott
a049d233d2 Bind mount ${groupDir}/log as /var/log
Before this patch we would bind mount ${groupDir} as /var/log,
but we wish to put data files in the group dir, so we should move
the logs to a subdirectory.

Signed-off-by: David Scott <dave.scott@docker.com>
2016-02-17 13:50:54 +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
1d2e9cacb0 bind mount Mac directories to top level
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-17 11:51:52 +00:00
Justin Cormack
c1797c304c add openssh client, as docker needs it for ssh based git clones
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-17 09:15:11 +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
Justin Cormack
b891c52525 Merge pull request #26 from dsheets/transfused
Transfused
2016-02-12 17:30:43 -08:00
Justin Cormack
e9bd1ad9cd bump aufs commit
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-12 17:03:16 -08:00
Justin Cormack
0008577f78 update kernel to 4.1.17
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-02-12 17:02:28 -08:00
David Sheets
b1d3101846 transfused: if the pidfile exists, make sure to truncate it 2016-02-12 14:08:11 +00:00
David Sheets
cbd5ca5991 transfused: it is ok if the pidfile does not yet exist 2016-02-12 14:08:11 +00:00
David Sheets
eb199ca9d7 transfused: init with a pidfile 2016-02-12 14:08:11 +00:00
David Sheets
7f088f9008 transfused: fix the 9p socket root name 2016-02-12 14:08:10 +00:00
David Sheets
94c3143c76 transfused: introduce command line arguments for pidfile, fusermount, 9p 2016-02-12 14:08:10 +00:00
David Sheets
d69b402584 transfused: improve some error message output and fix an fd mixup 2016-02-12 14:08:10 +00:00
David Sheets
c830c22335 transfused: add trace logging error checking 2016-02-12 14:08:10 +00:00
David Sheets
71fa8711ec transfused: do not check return of close
on advice from @justincormack
2016-02-12 14:08:10 +00:00
David Sheets
fee789baf1 transfused: hook debug into HUP-toggled run-time debug system 2016-02-12 14:08:10 +00:00
David Sheets
2fec071a41 transfused: clean up equal sign spacing 2016-02-12 14:08:10 +00:00
David Sheets
f949e737e8 transfused: clean up comma spacing 2016-02-12 14:08:10 +00:00
David Sheets
c8b9013ed3 transfused: use an absolute path for fusermount
Gets rid of non-portable execvpe for execve and prevents diversion.
Explicit diversion will be introduced as a command-line option later.
2016-02-12 14:08:10 +00:00
David Sheets
7ab2f3816c transfused: address @yallop's comments 2016-02-12 14:08:10 +00:00
David Sheets
1efc36a38c 9pudfuse: remove in favor of transfused 2016-02-12 14:08:09 +00:00