Justin Cormack
00f91b32fa
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
020da81d82
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
b911a646bd
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
9d2ff18b79
Merge pull request #436 from justincormack/fixproxy
...
Always copy in docker-proxy
2016-08-26 09:19:37 +01:00
Justin Cormack
bfcfb7c3a4
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
e4041871fc
Merge pull request #432 from justincormack/maxcpu
...
Unlimit max CPU cores in config
2016-08-25 09:33:18 +01:00
Justin Cormack
b2086fc693
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
5c21c6fb24
Merge pull request #431 from justincormack/noshutdownhack
...
Remove hacky code for fast shutdown
2016-08-24 10:13:53 +01:00
Justin Cormack
cf6ce0c0a9
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
72d850a401
Merge pull request #428 from justincormack/ubuntuup
...
Update build containers to Ubuntu 16.10
2016-08-23 23:24:20 +01:00
Justin Cormack
5b527df37c
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
06dfba5bbb
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
1e80ba4fe2
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
2ae37611d8
Merge pull request #425 from justincormack/sharedrun
...
Fix shared mount of /run
2016-08-22 23:06:07 +01:00
Justin Cormack
3f381afbfb
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
a8322804ef
Merge pull request #423 from justincormack/util-linux-fix
...
Util linux fix
2016-08-22 19:10:35 +01:00
Justin Cormack
6fbd9f1ca4
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
dbf0ec2bfc
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
0d84a352cb
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
af3947dd16
Merge pull request #420 from justincormack/no-util-linux
...
Remove util-linux
2016-08-22 11:51:56 +01:00
Justin Cormack
18389cf595
Merge pull request #422 from justincormack/linuxup
...
Update kernel and aufs
2016-08-22 11:47:56 +01:00
Justin Cormack
dce8e37a71
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
304320d7a4
Merge pull request #421 from justincormack/getdocker
...
List all docker binaries explicitly
2016-08-22 11:02:59 +01:00
Justin Cormack
99331b6ed4
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
1dd45af6ce
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
16a5d6def3
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
794af5ea3e
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
132d2f04c9
Merge pull request #418 from djs55/network-reconnect
...
tap-vsockd: support reconnection
2016-08-18 11:20:24 +01:00
David Scott
d5661d6426
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
de2109e373
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
f41f243097
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
5bdb60c30f
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
71ab6e9cb5
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
2245476095
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
05d22563f0
[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
3ccf34421d
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
b8c3c99e5e
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
Justin Cormack
8231fa56ab
Merge pull request #412 from justincormack/docker-1.12.1-rc1
...
Update to Docker 1.12.1-rc1
2016-08-12 21:44:43 +01:00
Justin Cormack
832b290a2b
Update to Docker 1.12.1-rc1
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-12 21:42:48 +01:00
Justin Cormack
79f6eac123
Merge pull request #410 from justincormack/sysfs
...
Add default sysfs settings
2016-08-12 14:23:14 +01:00
Justin Cormack
c0579f4b83
Add default sysfs settings
...
This uses the new Alpine sysfs.conf service to allow config of sysfs.
Default file that sets transparent huge pages to only be used on request
to fix #368
Database setting available for user configuration.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-12 14:13:40 +01:00
Justin Cormack
0f0c961603
Merge pull request #409 from justincormack/cleaner
...
clean up images built by compose to avoid cacheing
2016-08-12 13:44:10 +01:00
Justin Cormack
1cf430954a
clean up images built by compose to avoid cacheing
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-12 13:43:52 +01:00
Justin Cormack
3eae35d77b
Merge pull request #408 from justincormack/notalpha
...
Not alpha any more, missed this
2016-08-12 09:40:52 +01:00
Justin Cormack
6655cc9919
Not alpha any more, missed this
...
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-08-12 09:40:16 +01:00
Justin Cormack
5a08eaa774
Merge pull request #322 from dsheets/kernel-debug-build
...
kernel: introduce a Makefile DEBUG variable and a kernel_config for debugging
2016-08-10 17:11:21 +01:00
David Sheets
1163bf09be
kernel: apply debug configuration to all kernels
...
Signed-off-by: David Sheets <dsheets@docker.com>
2016-08-10 17:08:07 +01:00
David Sheets
9e5c86f006
kernel: add a Makefile DEBUG variable and a kernel_config for debugging
...
Signed-off-by: David Sheets <dsheets@docker.com>
2016-08-10 17:07:48 +01:00
Justin Cormack
5502354bf3
Merge pull request #406 from justincormack/gzipetty
...
Stop using container for gzip
2016-08-10 15:08:54 +01:00
Justin Cormack
a8f08434d4
Stop using container for gzip
...
Issue fixed in upstream alpine, gzip -9 now works correctly.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-10 15:07:11 +01:00