github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-09-25 16:46:23 +00:00
Code Issues Projects Releases Wiki Activity

Move containerd clone to tools/alpine

Browse Source 
As discussed before, as we use this in three places, cloning in
base makes more sense.

Update base image.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack
2017-08-21 15:16:09 +01:00
parent 92d31d733d
commit 90f905a799
9 changed files with 29 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/containerd/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM linuxkit/alpine:6ed3b299f5243acb6459b4993549c5045e4ad7f4 as alpine
FROM linuxkit/alpine:a120ad6aead3fe583eaa20e9b75a05ac1b3487da as alpine
RUN \
apk add \
btrfs-progs-dev \
@@ -10,13 +10,8 @@ RUN \
make \
tzdata \
&& true
ENV GOPATH=/go PATH=$PATH:/go/bin
# CONTAINERD_REPO and CONTAINERD_COMMIT are defined in linuxkit/alpine
RUN mkdir -p $GOPATH/src/github.com/containerd && \
cd $GOPATH/src/github.com/containerd && \
git clone $CONTAINERD_REPO
WORKDIR $GOPATH/src/github.com/containerd/containerd
RUN git checkout $CONTAINERD_COMMIT
RUN make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS="-extldflags \\\"-fno-PIC -static\\\""
RUN cp bin/containerd bin/ctr bin/containerd-shim /usr/bin/

1
pkg/containerd/Makefile
View File

@@ -1,5 +1,4 @@
IMAGE=containerd
NETWORK=1
DEPS=$(wildcard cmd/service/*.go) etc/containerd/config.toml
include ../package.mk

13
pkg/init/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM linuxkit/alpine:0fd732eb9e99c4db0953ae8de23d95de340ab847 AS build
FROM linuxkit/alpine:a120ad6aead3fe583eaa20e9b75a05ac1b3487da AS build
RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers
ADD usermode-helper.c ./
@@ -10,19 +10,10 @@ ENV GOPATH=/go PATH=$PATH:/go/bin
COPY cmd /go/src/cmd
RUN go-compile.sh /go/src/cmd/init
# checkout containerd for vendoring
ENV GOPATH=/go PATH=$PATH:/go/bin
# CONTAINERD_REPO and CONTAINERD_COMMIT are defined in linuxkit/alpine
RUN mkdir -p $GOPATH/src/github.com/containerd && \
cd $GOPATH/src/github.com/containerd && \
git clone $CONTAINERD_REPO
WORKDIR $GOPATH/src/github.com/containerd/containerd
RUN git checkout $CONTAINERD_COMMIT
RUN cd /go/src/cmd/service && ./skanky-vendor.sh $GOPATH/src/github.com/containerd/containerd
RUN go-compile.sh /go/src/cmd/service
FROM linuxkit/alpine:6ed3b299f5243acb6459b4993549c5045e4ad7f4 AS mirror
FROM linuxkit/alpine:a120ad6aead3fe583eaa20e9b75a05ac1b3487da 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 busybox musl

1
pkg/init/Makefile
View File

@@ -1,5 +1,4 @@
IMAGE=init
NETWORK=1
DEPS=usermode-helper.c $(wildcard etc/*) $(wildcard etc/init.d/*) $(shell find cmd -type f)
include ../package.mk