Commit Graph

1396 Commits

Author SHA1 Message Date
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
Justin Cormack
fe9dceafb6 Merge pull request #405 from justincormack/kernelup
Update kernel and aufs
2016-08-10 15:05:43 +01:00
Justin Cormack
dec4fb790f 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
444538b5ed Merge pull request #403 from justincormack/butts
Create a systemd cgroups mountpoint
2016-08-10 14:35:41 +01:00
Justin Cormack
cc6b2b7097 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
b6c9bd9b88 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
6e1bbbab08 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
0f8182c3e4 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
Rolf Neugebauer
bfb082206f Merge pull request #399 from rneugeba/win-passwd-fix
win: fix the CIFS mount extension of the KVP daemon
2016-08-09 17:56:49 +01:00
Rolf Neugebauer
e4b27c8509 win: fix the CIFS mount extension of the KVP daemon
Change the format of the registry value, create a credentials file
from the new value, and use that for the CIFS mount.

This should fix issues with password and usernames with un-usual characters in them.

Note this requires a matching change in the host app

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-08-09 17:41:48 +01:00
Justin Cormack
3899ca9cb7 hide any messages from tee about short writes when pipe aborted
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-09 17:40:32 +01:00
Justin Cormack
4c63ca4ce6 Merge pull request #397 from nathanleclaire/kickup_dhcp_timeouts
Increase DHCP timeout and retries
2016-08-09 16:18:25 +01:00
Justin Cormack
1ed1694bf4 Merge pull request #398 from justincormack/shared-run
Mount /run as shared
2016-08-09 11:50:53 +01:00
Justin Cormack
9fdb923056 Mount /run as shared
This is needed for volume drivers as they will mount their
volumes under here, and if they are running in a container
docker on the host will need to see these.

Also provide our own fstab, removes the media devices that were
there previously.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-09 11:46:08 +01:00
Nathan LeClaire
c7f289e395 Increase DHCP timeout and retries
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-08-08 17:41:46 -07:00
Justin Cormack
47c41dc02b Merge pull request #385 from justincormack/touch-tee
make sure test.log exists, and append, otherwise racy
2016-08-08 12:14:14 +02:00
Justin Cormack
7740b2cb86 Merge pull request #390 from justincormack/filemax
Increase fs.file-max
2016-08-08 12:13:42 +02:00
Justin Cormack
d260da34e0 Merge pull request #394 from justincormack/jq
Add jq to base
2016-08-04 12:13:11 +02:00
Justin Cormack
69eed1ea40 Add jq to base
Several people have asked for this for processing JSON config
data, and about to do some myself and parsing with a regex is
not so nice.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-04 11:11:53 +02:00
Justin Cormack
b8661a721b Increase fs.file-max
fixes #389

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-02 14:07:38 +02:00