From 85f0f008a9ed1185ee4633d5ddcc6ef4f72a4fef Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 6 Jul 2017 14:07:15 +0100 Subject: [PATCH 1/4] swarmd: update getty to latest Matching top-level linuxkit.yml Signed-off-by: Ian Campbell --- projects/swarmd/swarmd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index 78d67ee31..9674cfab2 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -23,7 +23,7 @@ onboot: image: linuxkit/metadata:428093dd1c4178e8ba1952af44b46c0fd16f8e79 services: - name: getty - image: linuxkit/getty:9f27c1272b6d128c9a09745e916f151d09cb0d27 + image: linuxkit/getty:08b704915af0ce90f8f40df5d41d4c1aa14ef83a env: - INSECURE=true - name: qemu-ga From b348957068c48469048249c2360bc5e8f1b3bf3e Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 21 Jul 2017 16:12:55 +0100 Subject: [PATCH 2/4] swarmd: Update to Weave 2.0.1 Signed-off-by: Ian Campbell --- projects/swarmd/swarmd.yml | 2 +- projects/swarmd/swarmd/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index 9674cfab2..562afe87e 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -35,7 +35,7 @@ services: - name: ntpd image: linuxkit/openntpd:19370f5d9bec84eb91073b7196b732f1301d9c90 - name: weave - image: weaveworks/weave@sha256:05172329b6ff72099db7bb891ac311b89948a3064ca9b8641c6b4abe38548677 # Must match swarmd/Dockerfile + image: weaveworks/weave:2.0.1@sha256:2d70caac7db33365482cc923d40ff8d3ec1238ae7fe06a00b3dde310d09f226e # Must match swarmd/Dockerfile command: ["/bin/sh", "/home/weave/weaver-wrapper"] capabilities: - all diff --git a/projects/swarmd/swarmd/Dockerfile b/projects/swarmd/swarmd/Dockerfile index 749291519..08d4a5170 100644 --- a/projects/swarmd/swarmd/Dockerfile +++ b/projects/swarmd/swarmd/Dockerfile @@ -1,4 +1,4 @@ -FROM weaveworks/weave@sha256:05172329b6ff72099db7bb891ac311b89948a3064ca9b8641c6b4abe38548677 AS weave +FROM weaveworks/weave:2.0.1@sha256:2d70caac7db33365482cc923d40ff8d3ec1238ae7fe06a00b3dde310d09f226e AS weave # Nothing to do in here, just for COPY --from=weave below From c17cf1f969f92df90290b3392a5ee7bb5281cead Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 21 Jul 2017 16:13:12 +0100 Subject: [PATCH 3/4] swarmd: Update swarmd package to current docker/swarmkit#2299 The PR has been rebased to containerd v1.0.0-alpha1. Signed-off-by: Ian Campbell --- projects/swarmd/swarmd/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/swarmd/swarmd/Dockerfile b/projects/swarmd/swarmd/Dockerfile index 08d4a5170..ce27cd450 100644 --- a/projects/swarmd/swarmd/Dockerfile +++ b/projects/swarmd/swarmd/Dockerfile @@ -40,9 +40,9 @@ RUN mkdir -p /out/usr/bin/ /out/etc /out/opt/cni/bin /out/etc/cni/net.d # Swarmd # https://github.com/ijc/swarmkit/tree/containerd-wip -ENV SWARMKIT_REPO=https://github.com/ijc25/swarmkit +ENV SWARMKIT_REPO=https://github.com/ijc/swarmkit ENV SWARMKIT_BRANCH=containerd-wip -ENV SWARMKIT_COMMIT=4a484ccb498bee117fe6167d5a5e7ea0f6d4f2e9 +ENV SWARMKIT_COMMIT=8a09c038f1ba8f227a28b7f48ccc92a04edb85f5 RUN mkdir -p $GOPATH/src/github.com/docker && \ cd $GOPATH/src/github.com/docker && \ From e2daca734f344e53dc313a1d87af63b1ce685b35 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 21 Jul 2017 16:35:49 +0100 Subject: [PATCH 4/4] swarmd: Update yml for swarmd package Signed-off-by: Ian Campbell --- projects/swarmd/swarmd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index 562afe87e..44cbd1a29 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -45,7 +45,7 @@ services: - /var:/var - /var/lib/swarmd:/weavedb - name: swarmd - image: linuxkitprojects/swarmd:1cd4c061cc7327750d2a12c267db6d4d9e26b1d3 + image: linuxkitprojects/swarmd:cce587b5e67b7d3e088a2e527dafc5ad3edb6502 command: ["/usr/bin/swarmd", "--containerd-addr=/run/containerd/containerd.sock", "--log-level=debug", "--state-dir=/var/lib/swarmd"] capabilities: - all