From b49ade56274bf41419ad4ce3ef8521fe97f24f37 Mon Sep 17 00:00:00 2001
From: Michael Ducy <michael@ducy.org>
Date: Thu, 5 Sep 2019 09:16:33 -0400
Subject: [PATCH] use COPY not ADD

Signed-off-by: Michael Ducy <michael@ducy.org>
---
 docker/kernel/httploader/Dockerfile |  7 +++----
 docker/kernel/linuxkit/Dockerfile   | 19 ++++++++++++++-----
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/docker/kernel/httploader/Dockerfile b/docker/kernel/httploader/Dockerfile
index 9b1cd51e..6c42b744 100644
--- a/docker/kernel/httploader/Dockerfile
+++ b/docker/kernel/httploader/Dockerfile
@@ -2,10 +2,9 @@ FROM golang:alpine AS build
 
 RUN apk --no-cache add build-base git bzr mercurial gcc ca-certificates
 
-ADD ./cmd /src/cmd
-ADD ./pkg /src/pkg
-ADD ./go.mod /src/go.mod
-ADD ./go.sum /src/
+COPY ./pkg /src/pkg/
+COPY ./cmd /src/cmd/
+COPY ./go.mod ./go.sum /src/
 
 RUN cd /src && CGO_ENABLED=0 GOOS=linux go build -a -o httploader -ldflags '-extldflags "-static"' cmd/httploader/main.go
 
diff --git a/docker/kernel/linuxkit/Dockerfile b/docker/kernel/linuxkit/Dockerfile
index e14c8918..c1bdb5bf 100644
--- a/docker/kernel/linuxkit/Dockerfile
+++ b/docker/kernel/linuxkit/Dockerfile
@@ -1,8 +1,16 @@
-FROM linuxkit/kernel:4.9.184 AS ksrc
-FROM falcosecurity/falco-minimal as falco
-FROM alpine:3.10 AS probe-build
+ARG ALPINE_VERSION=3.10
+ARG KERNEL_VERSION=4.9.184
 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=falco /usr/src/falco-${FALCO_VERSION} /usr/src/falco-${FALCO_VERSION}
 
@@ -11,7 +19,7 @@ RUN apk add --no-cache --update \
     bc \
     autoconf && \
   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 && \
   cd $KERNELDIR && \
   zcat /proc/1/root/proc/config.gz > .config && \
@@ -23,7 +31,8 @@ RUN apk add --no-cache --update \
     bc \
     autoconf
 
-FROM alpine:3.10
+FROM alpine:${ALPINE_VERSION}
 ARG FALCO_VERSION=0.17.0
+ENV FALCO_VERSION=${FALCO_VERSION}
 COPY --from=probe-build /usr/src/falco-${FALCO_VERSION}/falco-probe.ko /
 CMD ["insmod","/falco-probe.ko"]