Merge pull request #2722 from rn/lcow

LCOW: Update OpenGCS to latest
This commit is contained in:
Justin Cormack 2017-11-15 13:47:07 +00:00 committed by GitHub
commit 01d2ddfa3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -4,7 +4,7 @@ kernel:
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
tar: none tar: none
init: init:
- linuxkit/init-lcow:f47a2a1f2e7d739eefd7e4f5fa8dc1b1da574876 - linuxkit/init-lcow:f18287f91bf996fd931c3b59b538048653cd4f5f
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
files: files:
- path: etc/linuxkit.yml - path: etc/linuxkit.yml

View File

@ -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 mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
RUN apk add --no-cache --initdb -p /out \ RUN apk add --no-cache --initdb -p /out \
alpine-baselayout \ alpine-baselayout \
@ -7,9 +7,9 @@ RUN apk add --no-cache --initdb -p /out \
musl musl
RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache 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_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 RUN apk add --no-cache build-base curl git go musl-dev
ENV GOPATH=/go PATH=$PATH:/go/bin ENV GOPATH=/go PATH=$PATH:/go/bin
RUN git clone $OPENGCS_REPO /go/src/github.com/Microsoft/opengcs && \ RUN git clone $OPENGCS_REPO /go/src/github.com/Microsoft/opengcs && \