Merge pull request #41 from linuxkit/update

Update kernel/opengcs/runc

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.14.35
+  image: linuxkit/kernel:4.19.27
   cmdline: "console=ttyS0"
   tar: none
 init:
-  - linuxkit/init-lcow:504ccea8efafa6a6b2a9867c3847c2a493066bfa
-  - linuxkit/runc:v0.6
+  - linuxkit/init-lcow:15f50743b68117f4db1158c89530d47affbbd07b
+  - linuxkit/runc:606971451ea29b4238029804ca638f9f85caf5af
 files:
   - path: etc/linuxkit.yml
     metadata: yaml

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,23 +7,22 @@ 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
+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 && \
     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 && \