Commit Graph

1244 Commits

Author SHA1 Message Date
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
Justin Cormack
317f072eee 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
b42dd0570b 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
498bdea206 Merge pull request #410 from justincormack/sysfs
Add default sysfs settings
2016-08-12 14:23:14 +01:00
Justin Cormack
f4442e388b 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
39ac362823 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
000a78076f 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
249cfcd3e0 Merge pull request #408 from justincormack/notalpha
Not alpha any more, missed this
2016-08-12 09:40:52 +01:00
Justin Cormack
eca2215a96 Not alpha any more, missed this
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-08-12 09:40:16 +01:00
Justin Cormack
7966be4d27 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
296d1e10c7 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
661c19649a 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
c44b420357 Merge pull request #406 from justincormack/gzipetty
Stop using container for gzip
2016-08-10 15:08:54 +01:00
Justin Cormack
3dd0aa67d9 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
Justin Cormack
9c79549d59 Merge pull request #405 from justincormack/kernelup
Update kernel and aufs
2016-08-10 15:05:43 +01:00
Justin Cormack
55e15928ff Update kernel and aufs
- Linux 4.4.17
- AUFS 20160808

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-10 15:03:36 +01:00
Justin Cormack
213a4da03e Merge pull request #403 from justincormack/butts
Create a systemd cgroups mountpoint
2016-08-10 14:35:41 +01:00
Justin Cormack
5ab0f81954 Merge pull request #402 from rneugeba/htools-tweak
hvtools: remove broken size check for mount points
2016-08-10 14:35:19 +01:00
Justin Cormack
496c7caeed Create a systemd cgroups mountpoint
This allows systemd based containers to "just work".

Fixes https://github.com/docker/pinata/issues/3126

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-10 14:27:17 +01:00
Rolf Neugebauer
b5779784ca hvtools: remove broken size check for mount points
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-08-10 10:43:07 +01:00
Justin Cormack
fee67f0c85 Merge pull request #400 from justincormack/testerr
hide any messages from tee about short writes when pipe aborted
2016-08-09 22:42:19 +01:00