github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 17:49:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2242 from rn/lcow-net

Browse Source 
Fix networking in LCOW
This commit is contained in:
Rolf Neugebauer 2017-07-18 20:02:47 +01:00 committed by GitHub
commit c073b0ebd6
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
blueprints/lcow.yml
View File

@ -3,7 +3,8 @@ kernel:
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
tar: none tar: none
init: init:
- linuxkit/init-lcow:ae67df4c4cabb35aae06898cb94fe03972a172e9 - linuxkit/init-lcow:19ef62ccc57d3aa53c3fd9f7467ed4492b55f032
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
trust: trust:
org: org:
- linuxkit - linuxkit

12
pkg/init-lcow/Dockerfile
View File

@ -8,10 +8,11 @@ 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_COMMIT=d3ba8e211c0df4b0ee663bcfc00b4c2d88abcb9c
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
ENV OPENGCS_COMMIT=4e4e6f28a03e974e6c32f00a91d51f9605821fdd RUN git clone $OPENGCS_REPO /go/src/github.com/Microsoft/opengcs && \
RUN git clone https://github.com/Microsoft/opengcs.git /go/src/github.com/Microsoft/opengcs && \
cd /go/src/github.com/Microsoft/opengcs && \ cd /go/src/github.com/Microsoft/opengcs && \
git checkout $OPENGCS_COMMIT && \ git checkout $OPENGCS_COMMIT && \
cd service && \ cd service && \
@ -26,16 +27,9 @@ RUN mkdir /out && \
mkdir -p /out/root/integration && \ mkdir -p /out/root/integration && \
cp /go/src/github.com/Microsoft/opengcs/kernelconfig/4.11/prebuildSandbox.vhdx /out/root/integration/prebuildSandbox.vhdx cp /go/src/github.com/Microsoft/opengcs/kernelconfig/4.11/prebuildSandbox.vhdx /out/root/integration/prebuildSandbox.vhdx
# This d line below should be removed once
# https://github.com/Microsoft/opengcs/issues/52 is addressed and then
# runc should be added via the YAML file
FROM linuxkit/runc:a0f2894e50bacbd1ff82be41edff8b8e06e0b161 AS runc
FROM scratch FROM scratch
ENTRYPOINT [] ENTRYPOINT []
CMD [] CMD []
WORKDIR / WORKDIR /
COPY --from=mirror /out/ / COPY --from=mirror /out/ /
COPY --from=build /out/ / COPY --from=build /out/ /
COPY --from=runc /usr/bin/runc /sbin/runc