From e145ef02b3901647d350ef32ed35e04486d07fe5 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 14 Nov 2017 16:23:25 +0000 Subject: [PATCH 1/2] pkg/lcow: Update OpenGCS to latest While at it might as well bump alpine base Signed-off-by: Rolf Neugebauer --- pkg/init-lcow/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/init-lcow/Dockerfile b/pkg/init-lcow/Dockerfile index fddc8a13d..af1a1c81f 100644 --- a/pkg/init-lcow/Dockerfile +++ b/pkg/init-lcow/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS mirror +FROM linuxkit/alpine:7d79062909882186e881aad263668d66e6df2a28 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,9 +7,9 @@ RUN apk add --no-cache --initdb -p /out \ musl RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS build +FROM linuxkit/alpine:7d79062909882186e881aad263668d66e6df2a28 AS build ENV OPENGCS_REPO=https://github.com/Microsoft/opengcs -ENV OPENGCS_COMMIT=48ae4e3ba3d2fea746fb4dc20a72832a46f45466 +ENV OPENGCS_COMMIT=2a3a94cca366171f159399ffbd1333058e1cef53 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 7978731d29310e9384b79fcf60f0f42df34127d3 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 14 Nov 2017 16:42:14 +0000 Subject: [PATCH 2/2] blueprints: Update LCOW 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 4a521ba3a..5bca011d3 100644 --- a/blueprints/lcow.yml +++ b/blueprints/lcow.yml @@ -4,7 +4,7 @@ kernel: cmdline: "console=ttyS0" tar: none init: - - linuxkit/init-lcow:f47a2a1f2e7d739eefd7e4f5fa8dc1b1da574876 + - linuxkit/init-lcow:f18287f91bf996fd931c3b59b538048653cd4f5f - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d files: - path: etc/linuxkit.yml