github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-08-04 08:20:01 +00:00
Code Issues Projects Releases Wiki Activity

pkg: Use alpine 3.8 version of go (no need for go1.10)

Browse Source 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
This commit is contained in:
Rolf Neugebauer 2018-07-07 18:24:56 +01:00
parent a9acdd827e
commit 6045ddaf51
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/init/Dockerfile
View File

@ -4,10 +4,7 @@ RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-he
ADD usermode-helper.c ./ ADD usermode-helper.c ./
RUN LDFLAGS=-static CFLAGS=-Werror make usermode-helper RUN LDFLAGS=-static CFLAGS=-Werror make usermode-helper
# containerd v1.1.x requires go1.10 which is currently a separate package in RUN apk add --no-cache go musl-dev
# Alpine 3.7 Use the same version here for consistency and because we use the
# containerd client library.
RUN apk add --no-cache go1.10 musl-dev
ENV GOPATH=/go PATH=$PATH:/go/bin ENV GOPATH=/go PATH=$PATH:/go/bin
COPY cmd /go/src/cmd COPY cmd /go/src/cmd

4
pkg/runc/Dockerfile
View File

@ -1,12 +1,10 @@
FROM linuxkit/alpine:6264e5b39af8eb1da7ffa4c05a7ccc597da01197 as alpine FROM linuxkit/alpine:6264e5b39af8eb1da7ffa4c05a7ccc597da01197 as alpine
# containerd v1.1.x requires go1.10 which is currently a separate package in Alpine 3.7
# Use the same version of go for consistency.
RUN \ RUN \
apk add \ apk add \
bash \ bash \
gcc \ gcc \
git \ git \
go1.10 \ go \
libc-dev \ libc-dev \
libseccomp-dev \ libseccomp-dev \
linux-headers \ linux-headers \