From 44fee27848fc7dcd7b3144bef2c3a25f9c97d95b Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 17 Apr 2019 22:24:29 +0100 Subject: [PATCH 1/4] Update init package to lates alpine base (based on alpine 3.9) 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 45ea052..19b6c58 100644 --- a/pkg/init-lcow/Dockerfile +++ b/pkg/init-lcow/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec 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:518c2ed0f398c5508969ac5e033607201fb419ed AS build +FROM linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build ENV OPENGCS_REPO=https://github.com/Microsoft/opengcs ENV OPENGCS_COMMIT=92ea373dcfec072a7e9a6153bbeb2405eee9792a RUN apk add --no-cache build-base curl git go linux-headers musl-dev From 2c21b6f8a9e38bd262576962fbf88f0cdef444bf Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 17 Apr 2019 22:25:12 +0100 Subject: [PATCH 2/4] Update OpenGCS to latest 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 19b6c58..dcc84b0 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:86cd4f51b49fb9a078b50201d892a3c7973d48ec AS build ENV OPENGCS_REPO=https://github.com/Microsoft/opengcs -ENV OPENGCS_COMMIT=92ea373dcfec072a7e9a6153bbeb2405eee9792a +ENV OPENGCS_COMMIT=fefd0ad73f6bfa33b8cce597be303e134fddc408 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 6c7d5518a562fb7e70f3ae852243e5002b96b184 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 17 Apr 2019 22:31:55 +0100 Subject: [PATCH 3/4] Update init 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 0a28d0b..107886b 100644 --- a/lcow.yml +++ b/lcow.yml @@ -4,7 +4,7 @@ kernel: cmdline: "console=ttyS0" tar: none init: - - linuxkit/init-lcow:15f50743b68117f4db1158c89530d47affbbd07b + - linuxkit/init-lcow:e622118d49da5e1bea01e7cdf414c491d8b7c015 - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af files: - path: etc/linuxkit.yml From 755c45c77ca5c99f467c9cc542e1756393b8be80 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 17 Apr 2019 22:32:34 +0100 Subject: [PATCH 4/4] Update runc and kernel to latest Signed-off-by: Rolf Neugebauer --- lcow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lcow.yml b/lcow.yml index 107886b..2c03952 100644 --- a/lcow.yml +++ b/lcow.yml @@ -1,11 +1,11 @@ kernel: # For now use an older kernel. See https://github.com/linuxkit/linuxkit/issues/3120 - image: linuxkit/kernel:4.19.27 + image: linuxkit/kernel:4.19.34 cmdline: "console=ttyS0" tar: none init: - linuxkit/init-lcow:e622118d49da5e1bea01e7cdf414c491d8b7c015 - - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af + - linuxkit/runc:v0.7 files: - path: etc/linuxkit.yml metadata: yaml