Commit Graph

4610 Commits

Author SHA1 Message Date
Justin Cormack
2e40115f08 Merge pull request #2407 from tych0/sig-security-2017-08-16
add agenda for security SIG on the 16th
2017-08-14 19:42:05 +01:00
Avi Deitcher
40aee08ddb Add sgdisk package to linuxkit/alpine
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-08-14 18:30:30 +02:00
Rolf Neugebauer
d96e7ebe00 Merge pull request #2406 from rn/authors
Update authors with recent first-time contributors
2017-08-14 15:22:50 +01:00
Tycho Andersen
639d658fca add agenda for security SIG on the 16th
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-08-14 08:08:57 -06:00
Justin Cormack
a7b3384205 Merge pull request #2405 from rn/kern-up
Update kernels to 4.9.43/4.4.82
2017-08-14 14:54:47 +01:00
Rolf Neugebauer
bb5c24b313 Update authors with recent first-time contributors
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-14 14:07:08 +01:00
Ian Campbell
48ab78005e Merge pull request #2404 from tpot/tpot-patch-2
Update ssh_into_kubelet.sh to use ctr tasks exec
2017-08-14 11:05:02 +01:00
Rolf Neugebauer
2007c4eef0 Update YAML files to 4.9.43/4.4.82 kernels
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-14 11:02:30 +01:00
Rolf Neugebauer
72c2c7f85b kernel: Set LOCALVERSION to "-linuxkit" on arm64 as well
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-14 11:01:22 +01:00
Rolf Neugebauer
1882939623 kernel: Update to 4.9.43/4.4.82
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-14 10:58:54 +01:00
Rolf Neugebauer
ead41d0904 Update YAML files to 4.9.42 and 4.4.81 kernels
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-14 10:52:15 +01:00
Rolf Neugebauer
3889f198e5 kernel: Update to 4.9.42/4.4.81
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-14 10:45:56 +01:00
Rolf Neugebauer
714dbcf0fe Merge pull request #2399 from ijc/pkg-honour-hash-override
package: Do not add an arch suffix if an explicit HASH is given
2017-08-14 10:14:04 +01:00
Tim Potter
6f90d7a154 Update ssh_into_kubelet.sh to use ctr tasks exec
PR #1299 moved "ctr exec" into "ctr tasks exec" so update the kubernetes project to reflect this.

Signed-off-by: Tim Potter <tpot@hpe.com>
2017-08-14 13:52:24 +10:00
Justin Cormack
e9582e53d9 Merge pull request #2402 from ijc/containerd-v1.0.0-alpha4
Bump to containerd v1.0.0-alpha4 and runc v1.0.0-rc4
2017-08-11 19:46:53 +01:00
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
da6cbf74f3 alpine: Update to containerd v1.0.0-alpha4 base.
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-08-11 16:13:23 +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
Ian Campbell
0469901778 package: Do not add an arch suffix if an explicit HASH is given
During development I tend to do:
	make -C pkg/foo tag HASH=dev ORG=ijc
and I expect to get an image `ijc/foo:dev` and not `ijc/foo:dev-amd64`. In
general I think if the HASH has been explicitly provided the build should
just honour that.

To compensate and avoid mistaken pushes adjust the check for dirtiness to also
insist on a non-empty suffix.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-08-11 11:26:00 +01:00
Justin Cormack
0635ef9569 Merge pull request #2398 from zx2c4/bump-wireguard
wireguard: version bump
2017-08-11 10:39:07 +01:00
Jason A. Donenfeld
f74477def2 wireguard: version bump
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2017-08-10 23:17:22 +02:00
Justin Cormack
a3de645048 Merge pull request #2397 from dave-tucker/aws-panic
aws: Fix panic when there is no console output
2017-08-10 21:59:54 +01:00
Rolf Neugebauer
2cb045b571 Merge pull request #2396 from dave-tucker/aws-placement
aws: Honour the zone variable when creating an instance
2017-08-10 17:52:00 +01:00
Dave Tucker
90bf0cc2f6 aws: Fix panic when there is no console output
When an AWS machine is stopped and there is no console output the CLI
panics due to a nil pointer dereference. This commit checks that the
console output is not null before attempting to decode it.

Signed-off-by: Dave Tucker <dt@docker.com>
2017-08-10 17:28:09 +01:00
Dave Tucker
f574ada213 aws: Honour the zone variable when creating an instance
Instances were being created in a different AZ to the one specified in
the zone variable. This could lead to situations where the disks and the
instance were in different AZs and would result in an error.

This commit adds placement information to the API call used to create
the instance.

Fixes: #2388

Signed-off-by: Dave Tucker <dt@docker.com>
2017-08-10 16:49:56 +01:00
Justin Cormack
9f8628769e Merge pull request #2395 from justincormack/rootdirperm
Fix root directory permissions with overlay
2017-08-10 16:46:12 +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
Justin Cormack
c42ddc0af8 Fix root directory permissions with overlay
At least when running under Docker this seems to cause some issues,
possibly also explains some other oddnesses.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-08-10 14:22:12 +01:00
Justin Cormack
d2b7782419 Merge pull request #2393 from justincormack/kube-iso
Use ISO for kubernetes
2017-08-10 11:17:27 +01:00
Rolf Neugebauer
1a9d736f75 Merge pull request #2392 from rn/p2
Better kernel cmdline handling on packet.net
2017-08-09 14:20:55 +01:00
Rolf Neugebauer
a885eb3304 cmd: Append the kernel command line args when booting on Packet
The iPXE needs the hard coded value of 'kernel-params' but
we should append the kernel command line from the YAML in case
it sets other parameters.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-09 13:18:41 +01:00
Justin Cormack
56fe83292b Use ISOs to boot in the Kubernetes example
Because Kubernetes is 1.5GB, ISO makes sense as the files do not
take up memory, so you can boot a 1GB machine rather than a 4GB one.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-08-09 13:15:42 +01:00
Justin Cormack
ef3aa754d3 Merge pull request #2391 from justincormack/hyperkit-dir-check
Robustify ISO/kernel detection on hyperkit
2017-08-09 13:05:52 +01:00
Rolf Neugebauer
934d818bf1 cmd: Restructure iPXE script code for packet backend
Break it into multiple instructions. The single line was
super hard to parse.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-09 12:19:31 +01:00
Justin Cormack
34dc65561b Robustify ISO/kernel detection on hyperkit
Much easier to follow and more correct; also ignores directories.

fix #2385

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-08-09 12:00:00 +01:00
Rolf Neugebauer
ec2d7a1c94 Merge pull request #2386 from arm64b/kernel-4.4.x-bringup-fixing-aarch64
arm64: kernel 4.4.x bringup enablement
2017-08-09 11:27:17 +01:00
Dennis Chen
7f313870a9 arm64: kernel 4.4.x bringup enablement
Enable DEVPTS_MULTIPLE_INSTANCES in kernel configuration file
to avoid the devpts mounting hang issue during bootup when
running LinuxKit.

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
2017-08-09 02:56:36 +00:00
Riyaz Faizullabhoy
bbf8741002 Merge pull request #2383 from rn/lcow-up
Update LCOW
2017-08-08 10:12:36 -07:00
Rolf Neugebauer
f2b732d8a1 Update lcow blueprint
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-08 18:01:46 +01:00
Rolf Neugebauer
46d1e568cc pkg/init-lcow: Update opengcs
This has a number of fixes/improvements
- console resize
- better error handling (pass stacktrace/errors back to docker
- fix for container images which have a resolve.conf file

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-08 17:53:27 +01:00
Justin Cormack
95cc1a4c46 Merge pull request #2381 from rn/kup
Update kernels to 4.9.41/4.4.80
2017-08-08 17:51:02 +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
Rolf Neugebauer
4f5582edf2 kernel: Update to 4.9.41/4.4.80
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-08 17:46:21 +01:00
Justin Cormack
8cdd1223f5 Merge pull request #2380 from dave-tucker/extend-fixes
Cleanup the extend test cases
2017-08-08 17:43:58 +01:00
Ian Campbell
431c8ebdd7 kubernetes: Assume moby and linuxkit tools are in $PATH
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-08-08 16:25:37 +01:00