From 9c981f59b5822204eba47f3185f9c97a50a3e3a4 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 17 Mar 2019 12:20:39 -0700 Subject: [PATCH 1/6] Update kernel to 4.19.27 Signed-off-by: Rolf Neugebauer --- lcow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lcow.yml b/lcow.yml index b437e92..fafc45c 100644 --- a/lcow.yml +++ b/lcow.yml @@ -1,6 +1,6 @@ kernel: # For now use an older kernel. See https://github.com/linuxkit/linuxkit/issues/3120 - image: linuxkit/kernel:4.14.35 + image: linuxkit/kernel:4.19.27 cmdline: "console=ttyS0" tar: none init: From 699dc970604a98dd7cc9b5d65cd8212d6e44dd64 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 17 Mar 2019 12:21:46 -0700 Subject: [PATCH 2/6] Update runc to latest Signed-off-by: Rolf Neugebauer --- lcow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lcow.yml b/lcow.yml index fafc45c..dde3f0a 100644 --- a/lcow.yml +++ b/lcow.yml @@ -5,7 +5,7 @@ kernel: tar: none init: - linuxkit/init-lcow:504ccea8efafa6a6b2a9867c3847c2a493066bfa - - linuxkit/runc:v0.6 + - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af files: - path: etc/linuxkit.yml metadata: yaml From 37f69971e2a591085e03c3de29b0f1714f5da566 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 17 Mar 2019 16:24:56 -0700 Subject: [PATCH 3/6] pkg: Update to latest alpine base Signed-off-by: Rolf Neugebauer --- pkg/init-lcow/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/init-lcow/Dockerfile b/pkg/init-lcow/Dockerfile index cb5f0d0..06f3c95 100644 --- a/pkg/init-lcow/Dockerfile +++ b/pkg/init-lcow/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:ace75d0ec6978762d445083d6c8c6336bdb658ed AS mirror +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ @@ -7,7 +7,7 @@ RUN apk add --no-cache --initdb -p /out \ musl RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -FROM linuxkit/alpine:ace75d0ec6978762d445083d6c8c6336bdb658ed AS build +FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS build ENV OPENGCS_REPO=https://github.com/Microsoft/opengcs ENV OPENGCS_COMMIT=v0.3.9 RUN apk add --no-cache build-base curl git go linux-headers musl-dev From b6a2741bf492f34dd67879c27d4d9bc43e4a2d92 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 17 Mar 2019 16:23:53 -0700 Subject: [PATCH 4/6] pkg: Update to current HEAD of opengcs Signed-off-by: Rolf Neugebauer --- pkg/init-lcow/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/init-lcow/Dockerfile b/pkg/init-lcow/Dockerfile index 06f3c95..df82435 100644 --- a/pkg/init-lcow/Dockerfile +++ b/pkg/init-lcow/Dockerfile @@ -9,7 +9,7 @@ RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS build ENV OPENGCS_REPO=https://github.com/Microsoft/opengcs -ENV OPENGCS_COMMIT=v0.3.9 +ENV OPENGCS_COMMIT=92ea373dcfec072a7e9a6153bbeb2405eee9792a RUN apk add --no-cache build-base curl git go linux-headers musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin RUN git clone $OPENGCS_REPO /go/src/github.com/Microsoft/opengcs && \ From 92932e64a989bec4fd1b04ca4dfb712402cc75c2 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 17 Mar 2019 16:30:33 -0700 Subject: [PATCH 5/6] pkg: Update opengcs build Signed-off-by: Rolf Neugebauer --- pkg/init-lcow/Dockerfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/init-lcow/Dockerfile b/pkg/init-lcow/Dockerfile index df82435..45ea052 100644 --- a/pkg/init-lcow/Dockerfile +++ b/pkg/init-lcow/Dockerfile @@ -15,15 +15,14 @@ ENV GOPATH=/go PATH=$PATH:/go/bin RUN git clone $OPENGCS_REPO /go/src/github.com/Microsoft/opengcs && \ cd /go/src/github.com/Microsoft/opengcs && \ git checkout $OPENGCS_COMMIT && \ - make bin/vsockexec bin/gcs bin/gcstools && \ + make bin/init bin/vsockexec bin/gcs bin/gcstools && \ cd bin && \ - for tool in tar2vhd vhd2tar exportSandbox netnscfg remotefs; do ln -s gcstools $tool; done + for tool in vhd2tar exportSandbox netnscfg remotefs; do ln -s gcstools $tool; done RUN mkdir -p /out/bin && \ - cp -r /go/src/github.com/Microsoft/opengcs/bin/* /out/bin && \ - cp -r /go/src/github.com/Microsoft/opengcs/init/init /out/init && \ - chmod 755 /out/init && \ mkdir -p /out/sbin && \ + cp -r /go/src/github.com/Microsoft/opengcs/bin/* /out/bin && \ + mv /out/bin/init /out && \ curl -fSL "https://raw.githubusercontent.com/mirror/busybox/38d966943f5288bb1f2e7219f50a92753c730b14/examples/udhcp/simple.script" -o /out/sbin/udhcpc_config.script && \ chmod ugo+rx /out/sbin/udhcpc_config.script && \ git -C /go/src/github.com/Microsoft/opengcs rev-parse HEAD > /out/gcs.commit && \ From 6aad05902be75d397a2a195af4dc3c5d703a64cc Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 17 Mar 2019 16:38:46 -0700 Subject: [PATCH 6/6] Update to latest init-lcow Signed-off-by: Rolf Neugebauer --- lcow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lcow.yml b/lcow.yml index dde3f0a..0a28d0b 100644 --- a/lcow.yml +++ b/lcow.yml @@ -4,7 +4,7 @@ kernel: cmdline: "console=ttyS0" tar: none init: - - linuxkit/init-lcow:504ccea8efafa6a6b2a9867c3847c2a493066bfa + - linuxkit/init-lcow:15f50743b68117f4db1158c89530d47affbbd07b - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af files: - path: etc/linuxkit.yml