mirror of
				https://github.com/linuxkit/linuxkit.git
				synced 2025-11-04 03:09:44 +00:00 
			
		
		
		
	pkgs: Update packages to latest alpine base
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
This commit is contained in:
		@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS mirror
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS mirror
 | 
			
		||||
 | 
			
		||||
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 | 
			
		||||
RUN apk add --no-cache --initdb -p /out \
 | 
			
		||||
@@ -6,7 +6,7 @@ RUN apk add --no-cache --initdb -p /out \
 | 
			
		||||
    busybox
 | 
			
		||||
RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
 | 
			
		||||
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS mirror2
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS mirror2
 | 
			
		||||
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 | 
			
		||||
RUN apk add --no-cache --initdb -p /out \
 | 
			
		||||
    busybox-initscripts
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS mirror
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS mirror
 | 
			
		||||
 | 
			
		||||
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 | 
			
		||||
RUN apk add --initdb -p /out alpine-baselayout apk-tools audit busybox tini
 | 
			
		||||
 
 | 
			
		||||
@@ -1,10 +1,10 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS qemu
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS qemu
 | 
			
		||||
RUN apk add \
 | 
			
		||||
    qemu-aarch64 \
 | 
			
		||||
    qemu-arm \
 | 
			
		||||
    qemu-ppc64le
 | 
			
		||||
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS mirror
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS mirror
 | 
			
		||||
 | 
			
		||||
RUN apk add --no-cache go musl-dev
 | 
			
		||||
ENV GOPATH=/go PATH=$PATH:/go/bin
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 as alpine
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c as alpine
 | 
			
		||||
 | 
			
		||||
RUN apk add ca-certificates
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 as build
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c as build
 | 
			
		||||
 | 
			
		||||
RUN apk add --no-cache bash go git musl-dev linux-headers make
 | 
			
		||||
 | 
			
		||||
@@ -16,7 +16,7 @@ RUN go get -d ${GITREPO} \
 | 
			
		||||
    && mv cadvisor /usr/bin/
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS mirror
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS mirror
 | 
			
		||||
 | 
			
		||||
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 | 
			
		||||
RUN apk add --no-cache --initdb -p /out \
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:90571a1a9059f3bf33ca3431bc5396aa837a47d3 as alpine
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c as alpine
 | 
			
		||||
RUN apk add tzdata
 | 
			
		||||
 | 
			
		||||
WORKDIR $GOPATH/src/github.com/containerd/containerd
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS mirror
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c 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 \
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS mirror
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS mirror
 | 
			
		||||
 | 
			
		||||
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 | 
			
		||||
RUN apk add --no-cache --initdb -p /out \
 | 
			
		||||
@@ -15,7 +15,7 @@ RUN apk add --no-cache --initdb -p /out \
 | 
			
		||||
    && true
 | 
			
		||||
RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
 | 
			
		||||
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS build
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS build
 | 
			
		||||
 | 
			
		||||
RUN apk add --no-cache go musl-dev
 | 
			
		||||
ENV GOPATH=/go PATH=$PATH:/go/bin
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS build
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS build
 | 
			
		||||
RUN apk add --no-cache git
 | 
			
		||||
 | 
			
		||||
# Make sure you also update the FW_COMMIT in ../firmware/Dockerfile
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
# Make modules from a recentish kernel available
 | 
			
		||||
FROM linuxkit/kernel:4.14.28 AS kernel
 | 
			
		||||
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS build
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS build
 | 
			
		||||
RUN apk add --no-cache git kmod
 | 
			
		||||
 | 
			
		||||
# Clone the firmware repository
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS mirror
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS mirror
 | 
			
		||||
 | 
			
		||||
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 | 
			
		||||
RUN apk add --no-cache --initdb -p /out \
 | 
			
		||||
@@ -15,7 +15,7 @@ RUN apk add --no-cache --initdb -p /out \
 | 
			
		||||
    && true
 | 
			
		||||
RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
 | 
			
		||||
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS build
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS build
 | 
			
		||||
 | 
			
		||||
RUN apk add --no-cache go musl-dev
 | 
			
		||||
ENV GOPATH=/go PATH=$PATH:/go/bin
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS mirror
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS mirror
 | 
			
		||||
 | 
			
		||||
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 | 
			
		||||
RUN apk add --no-cache --initdb -p /out \
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS mirror
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS mirror
 | 
			
		||||
 | 
			
		||||
RUN apk add --no-cache go musl-dev git
 | 
			
		||||
ENV GOPATH=/go PATH=$PATH:/go/bin
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:90571a1a9059f3bf33ca3431bc5396aa837a47d3 AS build
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS build
 | 
			
		||||
RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers
 | 
			
		||||
 | 
			
		||||
ADD usermode-helper.c ./
 | 
			
		||||
@@ -19,7 +19,7 @@ RUN mkdir /tmp/bin && cd /tmp/bin/ && cp /go/bin/rc.init . && ln -s rc.init rc.s
 | 
			
		||||
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:90571a1a9059f3bf33ca3431bc5396aa837a47d3 AS mirror
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c 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,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS mirror
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS mirror
 | 
			
		||||
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 | 
			
		||||
RUN apk add curl
 | 
			
		||||
RUN apk add --no-cache --initdb -p /out \
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS mirror
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS mirror
 | 
			
		||||
 | 
			
		||||
RUN apk add --no-cache go musl-dev linux-headers
 | 
			
		||||
ENV GOPATH=/go PATH=$PATH:/go/bin
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS mirror
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS mirror
 | 
			
		||||
 | 
			
		||||
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 | 
			
		||||
RUN apk add --no-cache --initdb -p /out \
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS mirror
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS mirror
 | 
			
		||||
 | 
			
		||||
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 | 
			
		||||
RUN apk add --no-cache --initdb -p /out \
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS mirror
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS mirror
 | 
			
		||||
 | 
			
		||||
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 | 
			
		||||
RUN apk add --no-cache --initdb -p /out \
 | 
			
		||||
@@ -9,7 +9,7 @@ RUN apk add --no-cache --initdb -p /out \
 | 
			
		||||
    && true
 | 
			
		||||
RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
 | 
			
		||||
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS build
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS build
 | 
			
		||||
 | 
			
		||||
RUN apk add --no-cache go musl-dev
 | 
			
		||||
ENV GOPATH=/go PATH=$PATH:/go/bin
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 as build
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c as build
 | 
			
		||||
 | 
			
		||||
RUN apk add --no-cache go git musl-dev make
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS mirror
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c 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 \
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS mirror
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS mirror
 | 
			
		||||
 | 
			
		||||
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 | 
			
		||||
RUN apk add --no-cache --initdb -p /out \
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS build
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS build
 | 
			
		||||
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 | 
			
		||||
RUN mkdir -p /out/var/run
 | 
			
		||||
RUN apk add --no-cache --initdb -p /out \
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS mirror
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS mirror
 | 
			
		||||
 | 
			
		||||
RUN apk add --no-cache go gcc musl-dev linux-headers
 | 
			
		||||
ENV GOPATH=/go PATH=$PATH:/go/bin
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:02d7e748614512ea099e8c76254e41bcea03ba8f as alpine
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c 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 \
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS mirror
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS mirror
 | 
			
		||||
 | 
			
		||||
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 | 
			
		||||
RUN apk add --no-cache --initdb -p /out \
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS mirror
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS mirror
 | 
			
		||||
 | 
			
		||||
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 | 
			
		||||
RUN apk add --no-cache --initdb -p /out \
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS mirror
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS mirror
 | 
			
		||||
 | 
			
		||||
RUN apk add --no-cache go musl-dev
 | 
			
		||||
ENV GOPATH=/go PATH=$PATH:/go/bin
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS mirror
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS mirror
 | 
			
		||||
 | 
			
		||||
RUN apk add --no-cache go musl-dev
 | 
			
		||||
ENV GOPATH=/go PATH=$PATH:/go/bin
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,5 @@
 | 
			
		||||
# We need the `fstrim` binary:
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS mirror
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c 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 \
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS build
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS build
 | 
			
		||||
 | 
			
		||||
ENV TROUSERS_COMMIT de57f069ef2297d6a6b3a0353e217a5a2f66e444
 | 
			
		||||
ENV TPM_TOOLS_COMMIT bdf9f1bc8f63cd6fc370c2deb58d03ac55079e84
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS build
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS build
 | 
			
		||||
 | 
			
		||||
RUN apk add --no-cache go musl-dev git build-base
 | 
			
		||||
ENV GOPATH=/go PATH=$PATH:/go/bin 
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS mirror
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS mirror
 | 
			
		||||
 | 
			
		||||
RUN apk add --no-cache go musl-dev git build-base
 | 
			
		||||
ENV GOPATH=/go PATH=$PATH:/go/bin 
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS mirror
 | 
			
		||||
FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS mirror
 | 
			
		||||
 | 
			
		||||
RUN apk add --no-cache go musl-dev git build-base
 | 
			
		||||
ENV GOPATH=/go PATH=$PATH:/go/bin 
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user