use COPY not ADD

Signed-off-by: Michael Ducy <michael@ducy.org>
This commit is contained in:
Michael Ducy 2019-09-05 09:16:33 -04:00 committed by Leo Di Donato
parent 5a703ddbb8
commit b49ade5627
2 changed files with 17 additions and 9 deletions

View File

@ -2,10 +2,9 @@ FROM golang:alpine AS build
RUN apk --no-cache add build-base git bzr mercurial gcc ca-certificates RUN apk --no-cache add build-base git bzr mercurial gcc ca-certificates
ADD ./cmd /src/cmd COPY ./pkg /src/pkg/
ADD ./pkg /src/pkg COPY ./cmd /src/cmd/
ADD ./go.mod /src/go.mod COPY ./go.mod ./go.sum /src/
ADD ./go.sum /src/
RUN cd /src && CGO_ENABLED=0 GOOS=linux go build -a -o httploader -ldflags '-extldflags "-static"' cmd/httploader/main.go RUN cd /src && CGO_ENABLED=0 GOOS=linux go build -a -o httploader -ldflags '-extldflags "-static"' cmd/httploader/main.go

View File

@ -1,8 +1,16 @@
FROM linuxkit/kernel:4.9.184 AS ksrc ARG ALPINE_VERSION=3.10
FROM falcosecurity/falco-minimal as falco ARG KERNEL_VERSION=4.9.184
FROM alpine:3.10 AS probe-build
ARG FALCO_VERSION=0.17.0 ARG FALCO_VERSION=0.17.0
FROM linuxkit/kernel:${KERNEL_VERSION} AS ksrc
FROM falcosecurity/falco-minimal:${FALCO_VERSION} as falco
FROM alpine:${ALPINE_VERSION} AS probe-build
LABEL maintainer="opensource@sysdig.com"
ARG KERNEL_VERSION=4.9.184
ARG FALCO_VERSION=0.17.0
ENV FALCO_VERSION=${FALCO_VERSION}
ENV KERNEL_VERSION=${KERNEL_VERSION}
COPY --from=ksrc /kernel-dev.tar / COPY --from=ksrc /kernel-dev.tar /
COPY --from=falco /usr/src/falco-${FALCO_VERSION} /usr/src/falco-${FALCO_VERSION} COPY --from=falco /usr/src/falco-${FALCO_VERSION} /usr/src/falco-${FALCO_VERSION}
@ -11,7 +19,7 @@ RUN apk add --no-cache --update \
bc \ bc \
autoconf && \ autoconf && \
export KERNELVER=`uname -r | cut -d '-' -f 1` && \ export KERNELVER=`uname -r | cut -d '-' -f 1` && \
export KERNELDIR=/usr/src/linux-headers-4.9.184-linuxkit/ && \ export KERNELDIR=/usr/src/linux-headers-${KERNEL_VERSION}-linuxkit/ && \
tar xf /kernel-dev.tar && \ tar xf /kernel-dev.tar && \
cd $KERNELDIR && \ cd $KERNELDIR && \
zcat /proc/1/root/proc/config.gz > .config && \ zcat /proc/1/root/proc/config.gz > .config && \
@ -23,7 +31,8 @@ RUN apk add --no-cache --update \
bc \ bc \
autoconf autoconf
FROM alpine:3.10 FROM alpine:${ALPINE_VERSION}
ARG FALCO_VERSION=0.17.0 ARG FALCO_VERSION=0.17.0
ENV FALCO_VERSION=${FALCO_VERSION}
COPY --from=probe-build /usr/src/falco-${FALCO_VERSION}/falco-probe.ko / COPY --from=probe-build /usr/src/falco-${FALCO_VERSION}/falco-probe.ko /
CMD ["insmod","/falco-probe.ko"] CMD ["insmod","/falco-probe.ko"]