Merge pull request #2257 from rn/lcow-merge

LCOW: Use master of the main opengcs repo again
This commit is contained in:
Rolf Neugebauer 2017-07-20 12:12:40 +01:00 committed by GitHub
commit ccb03c465b
2 changed files with 3 additions and 3 deletions

View File

@ -3,7 +3,7 @@ kernel:
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
tar: none tar: none
init: init:
- linuxkit/init-lcow:5375fa62bada3faec048b22d41033dcf1e9ba727 - linuxkit/init-lcow:e846df6e745e0db2e90ec06a1a3509cb9bfd77da
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
trust: trust:
org: org:

View File

@ -8,8 +8,8 @@ RUN apk add --no-cache --initdb -p /out \
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:3744607156e6b67e3e7d083b15be9e7722215e73 AS build FROM linuxkit/alpine:3744607156e6b67e3e7d083b15be9e7722215e73 AS build
ENV OPENGCS_REPO=https://github.com/rn/opengcs ENV OPENGCS_REPO=https://github.com/Microsoft/opengcs
ENV OPENGCS_COMMIT=3a4ca49c445caaf4c6d4f0c1e613bae0c7455fb6 ENV OPENGCS_COMMIT=dec72ab7c137eb9aa5b3464a86b063359b8284bd
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 && \