Justin Cormack
69f290d28f
Remove support for arm kernel build
...
See #449 . Plan is to use upstream Alpine kernel for Arm, as
does not need vsock, hvsock or aufs.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-31 14:23:40 +01:00
David Scott
8f92071848
dhcp: request search domains (DHCP option 119)
...
Signed-off-by: David Scott <dave.scott@docker.com>
2016-08-31 14:06:55 +01:00
Justin Cormack
4ac99b09fb
Merge pull request #451 from justincormack/debughandling
...
Run dockerd in debug mode if not overridden in config file
2016-08-31 13:56:34 +01:00
Justin Cormack
b0f3012993
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
847edf1ff6
Merge pull request #447 from justincormack/dhcp-search-domains
...
Update Alpine base with DNS search domain config
2016-08-31 09:53:15 +01:00
Justin Cormack
15861d87f9
Update Alpine base with DNS search domain config
...
See #433
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-31 09:52:01 +01:00
Justin Cormack
f60a9028c7
Merge pull request #445 from justincormack/logrotate
...
Switch to ksyslogd to add log rotation
2016-08-31 09:48:38 +01:00
Justin Cormack
80bba73349
Switch to ksyslogd to add log rotation
...
See #441
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-30 11:37:30 +01:00
Justin Cormack
60d635f870
Merge pull request #446 from justincormack/qemurng
...
Add random device for qemu
2016-08-30 11:35:39 +01:00
Justin Cormack
a2677b6add
Add random device for qemu
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-30 11:35:26 +01:00
Justin Cormack
d388b40d07
Merge pull request #442 from justincormack/buildfix
...
Cleanup, move to mobylinux org
2016-08-30 10:45:39 +01:00
Justin Cormack
e03695bfa4
switch to mobylinux hub org
...
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-08-30 10:43:50 +01:00
Justin Cormack
d52c2b8a44
use build-base not alpine-sdk, it is smaller
...
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-08-30 10:43:34 +01:00
Justin Cormack
b0d5b82882
Merge pull request #440 from nathanleclaire/cmd_capture_revise
...
Add a few command capture tweaks
2016-08-30 10:30:21 +01:00
Nathan LeClaire
d7c2f7aed5
Add a few command capture tweaks
...
- Human readable df output
- Dramatically more history from Docker and syslog
- brctl doesn't output anything without 'show'
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-08-29 16:10:31 -07:00
Nathan LeClaire
970bc31977
Add ability to upload diagnostics to S3
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-08-29 16:03:27 -07:00
Justin Cormack
2121afb71d
Merge pull request #436 from justincormack/fixproxy
...
Always copy in docker-proxy
2016-08-26 09:19:37 +01:00
Justin Cormack
7981157503
Always copy in docker-proxy
...
Fix #434
Stupid mistake, sorry!
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-08-26 09:18:15 +01:00
Justin Cormack
aafe404e60
Merge pull request #432 from justincormack/maxcpu
...
Unlimit max CPU cores in config
2016-08-25 09:33:18 +01:00
Justin Cormack
e643a4b758
Unlimit max CPU cores in config
...
See https://github.com/docker/for-win/issues/59
Even on desktop we have users with more than 8 cores!
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-25 09:32:23 +01:00
Justin Cormack
259c7adbfe
Merge pull request #431 from justincormack/noshutdownhack
...
Remove hacky code for fast shutdown
2016-08-24 10:13:53 +01:00
Justin Cormack
2ed6616195
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
2ce23d58a7
Merge pull request #428 from justincormack/ubuntuup
...
Update build containers to Ubuntu 16.10
2016-08-23 23:24:20 +01:00
Justin Cormack
3628e60d54
Update build containers to Ubuntu 16.10
...
Should update to Alpine in future.
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-08-23 19:53:11 +01:00
Justin Cormack
0fd04d67ac
Merge pull request #426 from justincormack/shared-run
...
Resolved how to get busybox to created shared mounts
2016-08-23 00:19:16 +01:00
Justin Cormack
e534f613ca
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
21434cfa55
Merge pull request #425 from justincormack/sharedrun
...
Fix shared mount of /run
2016-08-22 23:06:07 +01:00
Justin Cormack
0032e8dcfc
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
eb275793a1
Merge pull request #423 from justincormack/util-linux-fix
...
Util linux fix
2016-08-22 19:10:35 +01:00
Justin Cormack
06dd021782
Busybox mount will not mount shared, so add a bind
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-22 19:09:24 +01:00
Justin Cormack
a4878c37d1
Fix for util-linux, no lsblk
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-22 19:08:26 +01:00
Justin Cormack
f254026ef2
Add block device for qemu and test
...
fix #356
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-22 19:07:34 +01:00
Justin Cormack
daae0e93b8
Merge pull request #420 from justincormack/no-util-linux
...
Remove util-linux
2016-08-22 11:51:56 +01:00
Justin Cormack
fdbc7ea046
Merge pull request #422 from justincormack/linuxup
...
Update kernel and aufs
2016-08-22 11:47:56 +01:00
Justin Cormack
32acad99a7
Update kernel and aufs
...
- Linux 4.4.19
- AUFS 20160822
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-22 11:05:07 +01:00
Justin Cormack
17e59c2d23
Merge pull request #421 from justincormack/getdocker
...
List all docker binaries explicitly
2016-08-22 11:02:59 +01:00
Justin Cormack
f88bb528af
Remove util-linux
...
This was added in #87 to support Kubernetes, but they no longer
support install via Docker so can remove.
Hopefully we have not started requiring this for anything else.
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-08-20 11:03:33 +01:00
Justin Cormack
19c9e29783
List all docker binaries explicitly
...
This will make it fail correctly on old versions that are unsupported.
Allow override of download host.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-19 14:50:18 +01:00
Justin Cormack
ddb6538c48
Merge pull request #419 from nathanleclaire/v1.12.1
...
Bump for Docker 1.12.1
2016-08-18 18:57:52 +01:00
Nathan LeClaire
49502493d3
Bump for Docker 1.12.1
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-08-18 10:49:07 -07:00
Justin Cormack
5a3b269c2c
Merge pull request #418 from djs55/network-reconnect
...
tap-vsockd: support reconnection
2016-08-18 11:20:24 +01:00
David Scott
000ca4806f
tap-vsockd: support reconnection
...
If the server side crashes and is restarted, this patch makes
tap-vsockd reconnect so the network is restored.
Signed-off-by: David Scott <dave.scott@docker.com>
2016-08-18 11:01:02 +01:00
Justin Cormack
9b95d939d0
Merge pull request #415 from justincormack/repeatable
...
[WIP] Make builds repeatable by tagging an image based on hash of package install
2016-08-18 10:49:10 +01:00
Justin Cormack
a832a83bde
Merge pull request #417 from nathanleclaire/editions_downstream_additions
...
Add modifications to help with downstream build
2016-08-18 10:40:52 +01:00
Nathan LeClaire
2a026c6cd7
Add modifications to help with downstream build
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-08-17 18:23:01 -07:00
Justin Cormack
893386c012
Merge pull request #416 from justincormack/docker-1.12.1-rc2
...
Update docker to 1.12.1-rc2
2016-08-17 11:31:24 +01:00
Justin Cormack
7fb834f850
Update docker to 1.12.1-rc2
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-17 11:28:21 +01:00
Justin Cormack
7420a00ba5
[WIP] Make builds repeatable by tagging an image based on hash of package install
...
This tags a base Alpine image with the packages we use by finding
the has of the package install manifest and using that to tag
the image on hub.
Hub org needs changing, and not sure how this will work out yet.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-17 00:28:08 +01:00
Justin Cormack
1e9b49035c
Merge pull request #413 from thaJeztah/remove-alpha-from-motd
...
remove "alpha" from motd
2016-08-13 19:38:48 +01:00
Sebastiaan van Stijn
075da30ad7
remove "alpha" from motd
...
commit 3eae35d77b
removed
"alpha" from "issue", but missed removing it here.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-13 20:20:03 +02:00