Commit Graph

733 Commits

Author SHA1 Message Date
Justin Cormack
9897241118 Improve mkfs options
- make quiet
- force, so some adjustments are not checked see https://github.com/docker/pinata/issues/6198
- set resize_inode as we do resize partitions on cloud and they could have very few inodes otherwise
- inline all the default options and remove the config file, so script is more standalone

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-12-12 10:36:49 -08:00
Justin Cormack
f3e3a4029b Containerize test suite
- run test suite under containerd
- in future this should be converted to Go not shell see #860
- test suite is now in its own initrd, can be run on any platform not just qemu

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-12-09 17:13:16 -08:00
Riyaz Faizullabhoy
a470b655d1 Set CONFIG_LEGACY_VSYSCALL to NONE and vsyscall=emulate
Regenerated the kernel config from container, which bumped the kernel
version and included some other fixes.  Also bumps the check-config
container to check for VSYSCALL_NATIVE

Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-12-09 12:09:35 -08:00
Nathan LeClaire
695061e4d0 Bump Azure SHA for v.1.13.0-rc3-beta13
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-12-08 12:37:08 -08:00
Riyaz Faizullabhoy
8ac566901d Change -1 to 1 in DOCKER_CONTENT_TRUST value
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-12-07 17:28:52 -08:00
Justin Cormack
5503a0c966 Update Docker to 1.13.0-rc3
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-12-05 20:31:16 -08:00
Nathan LeClaire
3a4c93118c Merge pull request #746 from justincormack/no-2375
Stop Docker listening on port 2375
2016-12-05 13:43:36 -08:00
Nathan LeClaire
9d86c3d1c8 Bump digest and re-add DOCKER_FOR_IAAS_VERSION for Azure
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-12-02 18:30:33 -08:00
Justin Cormack
0cdb8e7a84 Merge pull request #762 from simonferquel/vsudd_dontretry_on_dockerd
[vsudd] Don't retry when dockerd is not running
2016-12-02 08:23:23 -08:00
Justin Cormack
b2d3e6fa4a Merge pull request #828 from justincormack/azure-quoting
Missing quote in azure init script
2016-12-02 06:12:54 -08:00
Justin Cormack
f247551d52 Missing quote in azure init script
Fix #826

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-12-02 14:03:21 +00:00
Justin Cormack
bf1c21e045 Run rngd inside a system container
- this needs an init as it does not respond to stop signals, so include tini
- needs CAP_SYS_ADMIN to write to kernel entropy estimate
- set kernel.random.write_wakeup_threshold so that rngd does not need sysctl write access
- build patches from Alpine, but statically linked
- remove rngd from base image, means we no longer need community repository

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-12-02 14:00:12 +00:00
Justin Cormack
89efaa4fe7 Merge pull request #825 from justincormack/go-up
Update to Go 1.7.4
2016-12-02 01:59:39 -08:00
Justin Cormack
79e6f8c95d Update to Go 1.7.4
Security update.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-12-02 09:51:36 +00:00
Riyaz Faizullabhoy
cb1ebba19d Bump windows azure linux agent to include openssl config swapping logic
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-12-01 19:15:50 -08:00
Justin Cormack
116179c895 Merge pull request #820 from riyazdf/digests-and-trust
Use digests for external images and scripts where possible
2016-12-01 12:57:32 -08:00
Riyaz Faizullabhoy
8b7cdd41dc Use digests instead of tags where possible
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-12-01 09:39:02 -08:00
Riyaz Faizullabhoy
49a2fc6017 Use DCT in library run command
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-12-01 09:27:01 -08:00
Justin Cormack
ea4809a647 Use DOCKER_CONTENT_TRUST=1 when pulling library images
When building the base images always test signatures.

This will be the default at some point.

Add a test that content trust is working.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-30 13:35:38 +00:00
Justin Cormack
3e6301f501 Containerize binfmt_misc
- statically make containerd symlinks so rootfs can be read only
- run binfmt_misc in a containerd container
- ship arm, aarch64, ppc64le qemu static versions that always "just work" as this is supported in Linux 4.8

fix #53

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-30 12:49:37 +00:00
Simon Ferquel
2287d5d7d2 Redirect vsudd stdout/stderr to console
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
2016-11-30 10:31:11 +01:00
Simon Ferquel
d40570f976 [vsudd] Don't retry when dockerd is not running
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
2016-11-30 10:31:11 +01:00
Justin Cormack
71c4b1a07c Use shell to execute userdata
/tmp is mounted `noexec`, just use the shell to execute the userdata.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-29 15:19:09 +00:00
Justin Cormack
a10937be11 Fix directories under /var after formatting
- /var/lock test
- add /var/cache subdirectories
- move old boot2docker directories

fix #801
fix #792

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-28 16:12:51 +00:00
Justin Cormack
abef0edf38 Use the upstream binfmt script not out custom one
This makes the binfmt package much simpler, just a config file.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-28 13:53:14 +00:00
Justin Cormack
44832cec1b Use the procfs script to mount binfmt
This means our script does not need to do mount.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-28 12:17:23 +00:00
David Scott
3726abb3d1 Fix filesystem resize by calling e2fsck -f first
Previously when the block device was resized the partition table was also
resized but the filesystem was not. For an increase from 64GiB to 128GiB
the console showed:

     * Configuring host block device .../dev/vda1: clean, 62/4194304 files, 604445/16776960 blocks
    Resizing disk partition: Unpartitioned space /dev/vda: 64 GiB, 68719476736 bytes, 134217728 sectors
    resize2fs 1.43.3 (04-Sep-2016)
    Please run 'e2fsck -f /dev/vda1' first.

    /dev/vda1: clean, 62/4194304 files, 604445/16776960 blocks

This patch makes `resize2fs` happy by running `e2fsck -f` beforehand as
requested.

Signed-off-by: David Scott <dave.scott@docker.com>
2016-11-28 11:32:12 +00:00
Justin Cormack
8ccb1bfdb3 Remove last references to EXPERIMENTAL
Only support 1.13 now, experimental is a runtime flag.

see #647

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-24 13:37:07 +00:00
Justin Cormack
65d627b938 Use daemon version in diagnostics
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-24 12:23:27 +00:00
Justin Cormack
8d7957951c Update to Docker 1.13.0-rc2
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-23 21:40:23 +00:00
Justin Cormack
bd25c68032 Explicitly use slirp-proxy in iptables
So as to allow a read only root filesystem, we use the proxy
path config option to override the Docker proxy for 1.13.

This means that the iptables override needs to call this binary
not the original docker-proxy binary to allow port forwarding.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-23 13:48:27 +00:00
Justin Cormack
4619368531 Do not create swap file if the disk is small
- on very small disks, eg CI, do not create a swap file.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-23 11:25:19 +00:00
Justin Cormack
605c34be64 Resize device if there is free space
If the block device has unused free space, extend the filesystem on it.

Fix #120

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-22 21:59:53 +00:00
Justin Cormack
c686b47a99 Merge pull request #774 from nathanleclaire/azure_init_beta12
Azure init beta12
2016-11-21 23:54:17 +00:00
Nathan LeClaire
7fb43cb289 Include version and daemon.json in Azure init script
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-11-21 15:43:19 -08:00
Justin Cormack
3204fafc54 fix typo making swap file
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-21 23:02:44 +00:00
Justin Cormack
d1a1d7846b Update Docker init script for 1.13
- never update root filesystem see #583
- remove tests for earlier docker versions
- only use iptables override on desktop

fix #753

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-21 21:15:24 +00:00
Justin Cormack
94d6bbfa83 Merge pull request #764 from justincormack/extend
Simplify file system format code
2016-11-21 19:53:43 +00:00
Justin Cormack
db3cbe2eb2 Simplify file system format code
- use our own code rather than Alpine setup-disk
- remove alpine setup code as not needed
- do not create swap partitions
- create swap file on desktop editions for now (may remove)

Fix #619

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-21 18:35:13 +00:00
Justin Cormack
c19e17284d Merge pull request #702 from justincormack/syslog
Syslog support for docker logs
2016-11-21 17:47:31 +00:00
Justin Cormack
88eafcc239 update c build base image
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-18 23:32:47 +00:00
Justin Cormack
a85dbe129d Use syslog local0 for docker logs
This allows log rotation, redirect via syslog etc.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-18 16:23:41 +00:00
Justin Cormack
f5e2adadff Update check-config for Linux 4.8
Temporarily using unmerged version until upstream.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-18 11:50:36 +00:00
Justin Cormack
a0bddd4f54 Merge pull request #743 from justincormack/no-bind-log
Do not try to bind mount logs onto host on osx
2016-11-18 10:43:50 +00:00
Justin Cormack
b5d7cc306c Default to experimental if not specified in daemon.json
Most editions were shipping with experimental; now it is a daemon
flag this seems the best behaviour.

Only do this on recent dockerd as we are still supporting 1.12 for
a while longer.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-17 20:46:44 +00:00
Justin Cormack
e472be621f Stop Docker listening on port 2375
This is a huge security hole, remove from Moby.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-16 21:55:42 +00:00
Justin Cormack
040d6faeab upgrade Docker to 1.13.0-rc1
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-16 16:48:26 +00:00
Justin Cormack
78d0f03b65 Do not try to bind mount logs onto host on osx
This is not working well, and was binding over the logs, and losing
logs. We need a uniform approach on all platforms, planned to be
syslog.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-16 16:08:03 +00:00
Justin Cormack
da729cffff Merge pull request #738 from ijc25/master
diagnostics: Collect networking and swarm node + service info
2016-11-16 15:57:33 +00:00
Justin Cormack
8d406aa46e always wait for vsudd pidfile
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-16 13:07:32 +00:00