Commit Graph

564 Commits

Author SHA1 Message Date
Justin Cormack
b0f3012993 Run dockerd in debug mode if not overridden in config file
Fix #448

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-31 12:29:23 +01:00
Justin Cormack
d52c2b8a44 use build-base not alpine-sdk, it is smaller
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2016-08-30 10:43:34 +01:00
Nathan LeClaire
d7c2f7aed5 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
Justin Cormack
7981157503 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
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
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
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
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
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
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
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
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
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
213a4da03e Merge pull request #403 from justincormack/butts
Create a systemd cgroups mountpoint
2016-08-10 14:35:41 +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
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
3c090b7fa4 Increase fs.file-max
fixes #389

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-02 14:07:38 +02: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
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
Nathan LeClaire
be9fc93b72 Remove now incompatible Swarm init logic
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-07-27 10:34:57 -07:00
Justin Cormack
3bed9a18e9 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
6c9a66263e 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
d8f9d6c0b7 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
c619fe5ec5 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
721bf2c6e5 Merge pull request #351 from nathanleclaire/nathanleclaire2docker4xazure
Implement only one container for Azure
2016-07-25 23:42:33 +01:00
Nathan LeClaire
9684dd9e1d 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
c7e7e713f7 Continue POSIX-ifying build scripts
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-07-25 11:14:57 -07:00
Justin Cormack
d045eb449b Fix up mobyconfig startup code
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-25 14:03:03 +01:00
Justin Cormack
e3844179b6 fix typo
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-25 12:35:45 +01:00
Justin Cormack
a3dfb93479 Merge pull request #343 from justincormack/etchosts
add etc/hosts database key, as requested at Docker London
2016-07-22 14:41:15 +01:00
Justin Cormack
b1abb2f523 add etc/hosts database key, as requested at Docker London
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-22 14:27:20 +01:00
David Sheets
5567f50c1e Merge pull request #340 from dsheets/transfused-notify-channel
transfused notify channel
2016-07-22 13:58:28 +01:00
David Sheets
b25b891d3b transfused: copyedit a couple error messages
Signed-off-by: David Sheets <dsheets@docker.com>
2016-07-22 13:40:52 +01:00
David Sheets
821b329f7b transfused: add separate FUSE notify channel to avoid deadlock
This adds a new notify channel to the transfuse protocol. It is not
optional yet but could be made to be optional. A notify protocol and
notify channel are required because writing FUSE response messages to
the FUSE device has different semantics from writing asynchronous
notifications. In particular, response message writes only error on
malformed messages, do not take locks, and do not block. In contrast,
asynchronous notifications can error under normal conditions
(e.g. invalidating a cache entry that doesn't exist), can take locks
during the write call, and can block.

If responses and notifications occur in the same thread, the file system
can become deadlocked when syscalls lock resources waiting for a
response and a notification is written that blocks attempting to acquire
those same locks. The response that would unlock the contended lock
could be queued behind the notification write but the notification write
can't unblock until the response is written in the future. This patch
enables file systems to avoid that fate by offering a secondary channel
on which to send notifications.

Signed-off-by: David Sheets <dsheets@docker.com>
2016-07-22 13:35:57 +01:00
Justin Cormack
2b5b709600 Merge pull request #332 from justincormack/quietdb
only try to mount db for desktop editions
2016-07-22 10:53:40 +01:00
Justin Cormack
dcb1a678cc Merge pull request #324 from ncopa/alpine-gummiboot
Use upstream gummiboot binary and build EFI with alpine
2016-07-22 10:52:38 +01:00
Justin Cormack
32aa36439a allow for args for servers in diagnostics
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-21 18:38:38 +01:00
Justin Cormack
3ada321926 only try to mount db for desktop editions
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-21 18:37:34 +01:00
Justin Cormack
4370d9bd90 Merge pull request #331 from justincormack/fixdiag
fix typo
2016-07-21 17:35:37 +01:00
Justin Cormack
6a6f924283 fix typo
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-21 17:35:11 +01:00
Justin Cormack
c121983dd5 default to unknown platform if not specified in command line
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-21 17:25:48 +01:00
Justin Cormack
7682ed2503 Tweak disk detection diagnostics to match what is going on better
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-21 15:48:24 +01:00
Natanael Copa
01ba161477 Use upstream gummiboot binary and build EFI with alpine
Alpine 3.4 got gummiboot backported so we use that to build the EFI.

Signed-off-by: Natanael Copa <natanael.copa@docker.com>
2016-07-21 14:42:05 +02:00
Justin Cormack
20a85c16f1 Clean up sources that arm edition will not need
As arm will not be a desktop edition, we will not need to
try to fix these. We do need `diagnostics` though, the
vsock code however is not cross building, needs to be fixed
or made conditional.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-21 13:39:03 +01:00
Rolf Neugebauer
423b3c2765 Merge pull request #309 from justincormack/tapvsockvmbus
Use mobyplatform not vmbus for tap-vsock
2016-07-21 10:34:57 +01:00