Commit Graph

1116 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
6655cc9919 Not alpha any more, missed this
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-08-12 09:40:16 +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
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
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
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
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
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
7740b2cb86 Merge pull request #390 from justincormack/filemax
Increase fs.file-max
2016-08-08 12:13:42 +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
Justin Cormack
fdb7ff5a4b Merge pull request #382 from justincormack/gzip
Use a container for doing gzip compression
2016-07-29 17:07:10 +01:00
Justin Cormack
b0a11a214b Merge pull request #383 from justincormack/kernelup
Update kernel to 4.4.16
2016-07-29 16:43:41 +01:00
Rolf Neugebauer
02b7e852c7 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
1f4d6c0402 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
c310ffcd71 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
Nathan LeClaire
4a25850a68 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
05610e7965 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
62573222c1 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
202cb42a84 Update docker to 1.12.0 final
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-28 00:43:12 +01:00
Nathan LeClaire
7f822ee8b3 Remove now incompatible Swarm init logic
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-07-27 10:34:57 -07:00
Nathan LeClaire
5fe8b815aa Remove unneeded console=/dev/hvc0
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-07-26 09:13:34 -07:00
Justin Cormack
7b75a2d741 Enable swarm mode in test suite
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-26 16:20:29 +01:00
Justin Cormack
6973159dce On desktop editions, set default swarm advertise address to eth0
This allows plain `swarm init` to work. We do not support multi
node clusters yet as there is no way to reqach this address from
externally at present.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-26 16:10:20 +01:00
Justin Cormack
54f6dcc44e Update Docker to 1.12.0-rc5
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-26 13:23:29 +01:00
Justin Cormack
b17a1b7366 Support make flags for Docker version and experimental
Use `make DOCKER_VERSION=xxx` to override version. Note that
as install process and packaging may vary this may not work.

Use `make DOCKER_EXPERIMENTAL=0` to build from either release
binaries, if version is a final release or test binaries for
release candidates.

Building experimental is still the default.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-26 13:18:09 +01:00
Justin Cormack
a8389c8410 Merge pull request #352 from nathanleclaire/cloud_arch
Migrate script to new arch dir layout
2016-07-25 23:42:58 +01:00
Justin Cormack
48d09d8dc9 Merge pull request #351 from nathanleclaire/nathanleclaire2docker4xazure
Implement only one container for Azure
2016-07-25 23:42:33 +01:00
Nathan LeClaire
223ef9954d Migrate script to new arch dir layout
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-07-25 15:41:35 -07:00
Nathan LeClaire
d6f2883730 Implement only one container for Azure
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-07-25 15:39:04 -07:00
Nathan LeClaire
0aae9b68d6 Continue POSIX-ifying build scripts
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-07-25 11:14:57 -07:00
Natanael Copa
0bb80957bc Move built kernel to arch specific subdir
We want be able to build kernels for different archs without that they
clash with each other so we but the generated files into an $arch subdir.

Signed-off-by: Natanael Copa <natanael.copa@docker.com>
2016-07-25 17:18:02 +02:00
Justin Cormack
8ae5000ae7 Remove some VMWare devices
In particular vsock causes issues with virtio vsock

We are not supporting VMWare platform at present so not relevant..

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-25 14:23:24 +01:00