From f9f8b5bc42bb0933f2ba14bc03a535a8daabb94a Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 16 Aug 2017 16:50:34 +0100 Subject: [PATCH 1/2] pkg/lcow-init: Update to latest version of OpenGCS While at it also 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 1be516929..93f8bed5c 100644 --- a/pkg/init-lcow/Dockerfile +++ b/pkg/init-lcow/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror +FROM linuxkit/alpine:0fd732eb9e99c4db0953ae8de23d95de340ab847 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 \ @@ -9,7 +9,7 @@ RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS build ENV OPENGCS_REPO=https://github.com/Microsoft/opengcs -ENV OPENGCS_COMMIT=874b6714c9d15f9f346f7f6c080069b399285f06 +ENV OPENGCS_COMMIT=2dad06f038530dc305fb139a281507f1002e7e51 RUN apk add --no-cache build-base curl git go musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin RUN git clone $OPENGCS_REPO /go/src/github.com/Microsoft/opengcs && \ From 16f6aa9aef947ab2b7a3a27accda90183895f074 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 16 Aug 2017 16:54:17 +0100 Subject: [PATCH 2/2] blueprint: Update lcow blueprint to use the new init Signed-off-by: Rolf Neugebauer --- blueprints/lcow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blueprints/lcow.yml b/blueprints/lcow.yml index b5c57d0c9..eee42756f 100644 --- a/blueprints/lcow.yml +++ b/blueprints/lcow.yml @@ -3,7 +3,7 @@ kernel: cmdline: "console=ttyS0" tar: none init: - - linuxkit/init-lcow:5506c381816e067c3c8978948352b3bf2025e909 + - linuxkit/init-lcow:227221c5f344b59c841fd57d0a9decbc50f1bb5e - linuxkit/runc:838259153885c0c40460379d6cdb7baebaf3fa36 trust: org: