Commit Graph

1418 Commits

Author SHA1 Message Date
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
Rolf Neugebauer
45c24d20b0 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
a844c4b0e5 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
dde7f73985 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
82c391f47f Merge pull request #397 from nathanleclaire/kickup_dhcp_timeouts
Increase DHCP timeout and retries
2016-08-09 16:18:25 +01:00
Justin Cormack
194b383885 Merge pull request #398 from justincormack/shared-run
Mount /run as shared
2016-08-09 11:50:53 +01:00
Justin Cormack
398ade787e 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
de80738b07 Increase DHCP timeout and retries
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-08-08 17:41:46 -07:00
Justin Cormack
f1f73ad14e 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
1c8faeb1a1 Merge pull request #390 from justincormack/filemax
Increase fs.file-max
2016-08-08 12:13:42 +02:00
Justin Cormack
48d9367139 Merge pull request #394 from justincormack/jq
Add jq to base
2016-08-04 12:13:11 +02:00
Justin Cormack
9f41d17f89 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
3c090b7fa4 Increase fs.file-max
fixes #389

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-02 14:07:38 +02:00
Justin Cormack
17bf65f0de Merge pull request #382 from justincormack/gzip
Use a container for doing gzip compression
2016-07-29 17:07:10 +01:00
Justin Cormack
05df812959 Merge pull request #383 from justincormack/kernelup
Update kernel to 4.4.16
2016-07-29 16:43:41 +01:00
Justin Cormack
2e11737f16 Merge pull request #384 from rneugeba/diag-fix
diagnostics: fix diagnostics for local/desktop editions
2016-07-29 16:38:34 +01:00
Justin Cormack
da7448e6ef make sure test.log exists, and append, otherwise racy
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-29 16:33:01 +01:00
Rolf Neugebauer
c36072713a diagnostics: fix diagnostics for local/desktop editions
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2016-07-29 16:28:34 +01:00
Justin Cormack
e30cb91bce Update kernel to 4.4.16
This contains a lot of fixes for overlay.

Fix #374

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-29 16:21:24 +01:00
Justin Cormack
8fbee7e0b8 Use a container for doing gzip compression
The CI uses Alpine with busybox and that version is not good
at compression.

ALso use `.DELETE_ON_ERROR` so empty files are not created on failure.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-29 16:00:49 +01:00
Justin Cormack
06fda31deb Merge pull request #379 from nathanleclaire/bump_1.12.0
Bump cloud tag for 1.12.0
2016-07-29 00:23:37 +01:00
Nathan LeClaire
61224972e6 Bump cloud tag for 1.12.0
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-07-28 16:22:09 -07:00
Justin Cormack
eb8430115d Merge pull request #376 from justincormack/slowershutdown
Allow longer for Docker to shut down
2016-07-28 19:13:14 +01:00
Justin Cormack
9e51ff5401 Allow longer for Docker to shut down
Docker needs 10s at least for containers to be allowed to shut down,
so allow 15s maximum between SIGTERM and SIGKILL.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-28 17:25:49 +01:00
Justin Cormack
0ceb8111e9 Merge pull request #372 from justincormack/docker-1.12.0
Update docker to 1.12.0 final
2016-07-28 01:17:55 +01:00
Justin Cormack
4813ffe3cd Update docker to 1.12.0 final
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-28 00:43:12 +01:00
Justin Cormack
6ac08f29dc Merge pull request #371 from nathanleclaire/remove_azure_deprecated_swarm_features
Remove now incompatible Swarm init logic
2016-07-27 18:36:53 +01:00