Commit Graph

934 Commits

Author SHA1 Message Date
Ian Campbell
50324d2d96 tests: update hash and reenable linuxkit.packages.containerd
This works again now.

Fixes #2328.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-08-11 18:10:52 +01:00
Ian Campbell
0db9131e90 tests: update containerd test container
- xfsprogs is required for mkfs.xfs for some tests.
- mount persistent disk on /var/lib instead of /var.
- include host /dev (for loop devices) in mounts.
- /tmp need not be exec.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-08-11 18:07:12 +01:00
Ian Campbell
6f0d9d855b Update yml for containerd v1.0.0-alpha4 and runc v1.0.0-rc4
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-08-11 16:21:42 +01:00
Ian Campbell
e11c1c0224 pkg: Bump to containerd v1.0.0-alpha4 and runc v1.0.0-rc4
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-08-11 16:16:33 +01:00
Ian Campbell
ff6d5b384a test-containerd: Drop net:host and /dev mount
net:host is the default and this test does not need the host /dev.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-08-11 16:11:11 +01:00
Ian Campbell
3c269d4320 test-containerd: output the revision in the test tree
So it'll appear in the logs.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-08-11 16:11:11 +01:00
Ian Campbell
b194a96584 test-containerd: move git clone into mirror
`${CONTAINERD_COMMIT}` is only defined in the `FROM linuxkit/alpine` section
and not the in `FROM scratch` section.

This means we were always checking out the current master at the time of build
rather than the expected commit because `git checkout $CONTAINERD_COMMIT` was
expanding to `git checkout `.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-08-11 16:11:11 +01:00
Justin Cormack
fae7a76009 update runc and containerd images
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-08-10 14:33:21 +01:00
Rolf Neugebauer
9beaf45a07 Update YAML files with new kernels
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-08 17:46:22 +01:00
Dave Tucker
6aed51ca5c tests: Remove hardcoded sizes from extend tests
In order to update these tests it required first running df -h to obtain
the new disk size and then adding that value to check.sh
This commit replaces the hardcoded values with a regex that checks that
the filesystem is somewhere between 400-599MB in size. Before being
extended this would have been somewhere in the region of 200-300MB.

Signed-off-by: Dave Tucker <dt@docker.com>
2017-08-08 13:47:32 +01:00
Dave Tucker
e17a12219a tests: Remove docker dependency from extend tests
This commit removes the dependency on Docker by using raw disks and
appending from /dev/zero to extend them once initially formatted.

Additionally, the tests now use unique ${NAME} variables

Signed-off-by: Dave Tucker <dt@docker.com>
2017-08-08 12:43:50 +01:00
Dave Tucker
9a562a3b8c tests: Fix ordering in package directory and add a note
Signed-off-by: Dave Tucker <dt@docker.com>
2017-08-08 11:58:21 +01:00
Justin Cormack
e61794a344 Merge pull request #2365 from deitch/test-dev-existence-getty
Test dev existence getty
2017-08-07 20:32:39 +01:00
Justin Cormack
9e26ffbc6c update init hashes
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-08-07 15:04:42 +01:00
Ian Campbell
3a71c4a291 Update yml for new runc and containerd.
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-08-07 12:11:32 +01:00
Avi Deitcher
944fc95e31 Update example gettt hash
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-08-06 10:27:54 +03:00
Justin Cormack
0b2e34301b Merge pull request #2357 from justincormack/arm64-rngd
Support rngd on arm64
2017-08-04 16:13:46 +01:00
Justin Cormack
d164bcf283 update hashes for rngd
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-08-04 14:10:51 +01:00
Justin Cormack
ee349da98a update hashes for sysctl (arm and x86)
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-08-04 13:34:14 +01:00
Rolf Neugebauer
633195cbe3 Update YAML files with new multi-arch packages
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-03 17:46:11 +01:00
Rolf Neugebauer
07cdcfeb65 Update all test YAML files with new multi-arch test packages
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-03 17:36:22 +01:00
Rolf Neugebauer
551e43294f tests: Update alpine base to multi-arch
The following packages did not work on aarch64:
- linuxkit/test-docker-bench
- linuxkit/test-ltp
- linuxkit/test-ns
- linuxkit/test-virtsock

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-03 17:36:22 +01:00
Rolf Neugebauer
b271a3b91f build: Add makefile to ./test/pkg
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-03 17:36:22 +01:00
Justin Cormack
dc91e84223 Merge pull request #2347 from justincormack/less-binfmt
Remove binfmt from most examples
2017-08-03 17:33:49 +01:00
Justin Cormack
842d089a1b Remove binfmt from most examples
It is not in any wa=y a required container, and now that arm64
and other architecture machines are widely available we should
start to deprecate it, as it has many issues, eg requires patches
to qemu for Go support, will mislabel images etc.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-08-03 15:06:49 +01:00
Justin Cormack
075dd61efe update rngd hashes
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-08-02 21:03:46 +01:00
Zachery Hostens
dd0c340264 update cleanup to use -depth option
Signed-off-by: Zachery Hostens <zacheryph@gmail.com>
2017-08-02 08:04:40 -05:00
Justin Cormack
4daf008956 Merge pull request #2331 from justincormack/rng-golang
Replace rngd with a Go version
2017-08-01 10:56:10 +01:00
Justin Cormack
3bcd6b5113 update sysctl hashes
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-31 23:10:25 +01:00
Justin Cormack
ded8ebd280 add init hashes
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-31 21:11:33 +01:00
Justin Cormack
0a3d78e47f Update hashes for rngd and add a one shot example in sshd
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-31 20:18:20 +01:00
Justin Cormack
157b9f27aa update hashes for mount
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-31 17:33:58 +01:00
Justin Cormack
26b6a0cbdd update hash for init
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-31 15:27:22 +01:00
Justin Cormack
c49aea18ca Update hashes for a test that was missed
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-31 14:08:03 +01:00
Justin Cormack
782d40bf28 update hashes
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-31 13:57:41 +01:00
Justin Cormack
b3378652e3 Fix tests that fail with true read only
Mounting a directory inside a read only container requires that to be
created in advance, but `runc` worked around that if the rootfs was not
originally read only.

You cannot even bind mount a file that does not exist into a
read only container.

The containerd test is given a disk, as running on an overlay does
not work; however it is also disabled as one of the parts of the test
is failing, needs investigation.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-31 13:49:40 +01:00
Rolf Neugebauer
c57cea4757 Merge pull request #2318 from rn/kern-up
Update kernel to 4.9.40/4.4.79, remove 4.11.x
2017-07-28 22:28:10 +01:00
Rolf Neugebauer
9812d0e5ea Update YAML files with new kernels
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-28 20:17:13 +01:00
Rolf Neugebauer
0714aa7380 kernel: Remove 4.11.x
It has been EOLed today and won't receive any further updates.

The images are still on hub so can be continued to be used
for the time being.

4.12 support is coming soon.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-28 20:14:01 +01:00
Justin Cormack
927028cb96 update sysctl hash
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-28 17:56:41 +01:00
Justin Cormack
280ee41e34 Merge pull request #2310 from justincormack/binfmt-basedir
Add mountpoint to binfmt image
2017-07-27 16:34:50 +01:00
Justin Cormack
2c58fbc01a Merge pull request #2308 from ijc/avoid-orig-extension
test: rename *.orig to *.in
2017-07-27 15:17:27 +01:00
Justin Cormack
7211045ba6 update binfmt hashes
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-27 15:11:14 +01:00
Avi Deitcher
8f10f69fd3 Merge pull request #2233 from dave-tucker/ns-detect
getty: Detect if you are in a namespace
2017-07-27 16:50:02 +03:00
Ian Campbell
3cc80c02e7 test: rename *.orig to *.in
*.orig is also dropped by failed patch application and so is subject to
automatically being cleaned up.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-27 13:47:53 +01:00
Avi Deitcher
d4f5878669 Update hashes in examples 2017-07-27 15:45:19 +03:00
Avi Deitcher
5cda493a21 Update hashes for getty
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-07-27 15:01:29 +03:00
Ian Campbell
88ab788749 tests: reenable linuxkit.packages.containerd
The newest tests actually run containerd and therefore have some additional
requirements:
- containerd + shim + runc binaries are needed. We bind these in from the host.
  The test code should, by design, be from matching containerd source, assuming
  we remember to update test/pkg/container/Dockerfile when we bump
  CONTAINERD_COMMIT.  5217b9973b added a reminder
  to do so.
- the tests need networking (to pull images). So add dhcp to onboot and bind
  /etc/resolv.conf into the test container.
- running containers requires a writeable cgroup mount.
- containerd wants /etc/localtime, so install the UTC one (as we do in
  pkg/containerd).

The test image already has `net: host` and `capabilities: all`.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-27 12:06:59 +01:00
Ian Campbell
017d3304fc Update yml after containerd bump
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-27 11:45:56 +01:00
Ian Campbell
8eb6709a3c containerd: Bump to new alpine (with v1.0.0-alpha2)
The logrus import path has changed, so adjust. Also there is a minor API change
to the containerd.IOCreation() function spec, it now takes a string id which we
can ignore.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-27 11:07:03 +01:00