From 4f89e97e5e67538242e416ea6dcd166c25c82d8c Mon Sep 17 00:00:00 2001
From: Eric Ernst <eric.ernst@intel.com>
Date: Wed, 16 Oct 2019 12:24:01 -0700
Subject: [PATCH] kata-deploy: look for kata artifacts locally

When building the kata-deploy images before, we would look to pull the
latest artifacts from the release URL.

It would be better to allow the user to pull from this URL, or to create
the artifacts locally, and pass the location of this tar.xz to the build
process.

Instead of providing KATA_VER, builders should provide KATA_ARTIFACTS,
which is the filename that is assumed to be located within the docker
build path.

Signed-off-by: Eric Ernst <eric.ernst@intel.com>
---
 kata-deploy/Dockerfile | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/kata-deploy/Dockerfile b/kata-deploy/Dockerfile
index 5009232941..5db3a0bca0 100644
--- a/kata-deploy/Dockerfile
+++ b/kata-deploy/Dockerfile
@@ -1,24 +1,22 @@
 FROM centos/systemd
-ARG KATA_VER
-ARG ARCH=x86_64
 ARG KUBE_ARCH=amd64
-ARG KATA_URL=https://github.com/kata-containers/runtime/releases/download/${KATA_VER}
-ARG KATA_FILE=kata-static-${KATA_VER}-${ARCH}.tar.xz
+ARG KATA_ARTIFACTS=./kata-static.tar.xz
+ARG DESTINATION=/opt/kata-artifacts
+
+COPY ${KATA_ARTIFACTS} .
 
 RUN \
 yum install -y epel-release && \
 yum install -y bzip2 jq && \
-curl -sOL ${KATA_URL}/${KATA_FILE} && \
-mkdir -p /opt/kata-artifacts && \
-tar xvf ${KATA_FILE} -C /opt/kata-artifacts/ && \
-chown -R root:root /opt/kata-artifacts/ && \
-rm ${KATA_FILE}
+mkdir -p ${DESTINATION} && \
+tar xvf ${KATA_ARTIFACTS} -C ${DESTINATION}/ && \
+chown -R root:root ${DESTINATION}/
 
 RUN \
 curl -Lso /bin/kubectl https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/${KUBE_ARCH}/kubectl && \
 chmod +x /bin/kubectl
 
-COPY scripts /opt/kata-artifacts/scripts
+COPY scripts ${DESTINATION}/scripts
 RUN \
-ln -s /opt/kata-artifacts/scripts/kata-deploy-docker.sh /usr/bin/kata-deploy-docker && \
-ln -s /opt/kata-artifacts/scripts/kata-deploy.sh /usr/bin/kata-deploy
+ln -s ${DESTINATION}/scripts/kata-deploy-docker.sh /usr/bin/kata-deploy-docker && \
+ln -s ${DESTINATION}/scripts/kata-deploy.sh /usr/bin/kata-deploy