From 1023504dce0652ec22a0f4f28a429c76976d29ec Mon Sep 17 00:00:00 2001
From: Mikko Ylinen <mikko.ylinen@intel.com>
Date: Mon, 19 Aug 2019 11:04:31 +0300
Subject: [PATCH] gpu: move to clearlinux based images

Switch to clearlinux based image and rootfs and add
enablers to make builds reproducible.

Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>
---
 build/docker/intel-gpu-plugin.Dockerfile | 35 ++++++++++++++++++++----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/build/docker/intel-gpu-plugin.Dockerfile b/build/docker/intel-gpu-plugin.Dockerfile
index 1ce15090..c17ae9b7 100644
--- a/build/docker/intel-gpu-plugin.Dockerfile
+++ b/build/docker/intel-gpu-plugin.Dockerfile
@@ -1,10 +1,35 @@
-FROM golang:1.11 as builder
+# CLEAR_LINUX_BASE and CLEAR_LINUX_VERSION can be used to make the build
+# reproducible by choosing an image by its hash and installing an OS version
+# with --version=:
+# CLEAR_LINUX_BASE=clearlinux@sha256:b8e5d3b2576eb6d868f8d52e401f678c873264d349e469637f98ee2adf7b33d4
+# CLEAR_LINUX_VERSION="--version=29970"
+#
+# This is used on release branches before tagging a stable version.
+# The master branch defaults to using the latest Clear Linux.
+ARG CLEAR_LINUX_BASE=clearlinux/golang:latest
+
+FROM ${CLEAR_LINUX_BASE} as builder
+
+ARG CLEAR_LINUX_VERSION=
+
+RUN swupd update --no-boot-update ${CLEAR_LINUX_VERSION}
+RUN mkdir /install_root \
+    && swupd os-install \
+    ${CLEAR_LINUX_VERSION} \
+    --path /install_root \
+    --statedir /swupd-state \
+    --bundles=os-core \
+    --no-boot-update \
+    && rm -rf /install_root/var/lib/swupd/*
+
 ARG DIR=/go/src/github.com/intel/intel-device-plugins-for-kubernetes
 WORKDIR $DIR
 COPY . .
 RUN cd cmd/gpu_plugin; go install
-RUN chmod a+x /go/bin/gpu_plugin
+RUN chmod a+x /go/bin/gpu_plugin \
+    && install -D /go/bin/gpu_plugin /install_root/usr/local/bin/intel_gpu_device_plugin \
+    && install -D ${DIR}/LICENSE /install_root/usr/local/share/package-licenses/intel-device-plugins-for-kubernetes/LICENSE
 
-FROM gcr.io/distroless/base
-COPY --from=builder /go/bin/gpu_plugin /usr/bin/intel_gpu_device_plugin
-CMD ["/usr/bin/intel_gpu_device_plugin"]
+FROM scratch as final
+COPY --from=builder /install_root /
+CMD ["/usr/local/bin/intel_gpu_device_plugin"]