Merge pull request #595 from mythi/PR-2021-016

images: force buildah to use runc

Author: bart0sh

build/docker/build-image.sh

@@ -32,7 +32,7 @@ fi
 if [ -z "${BUILDER}" -o "${BUILDER}" = 'docker' ] ; then
     docker build --pull -t ${IMG}:${TAG} ${BUILD_ARGS} -f ${DOCKERFILE} .
 elif [ "${BUILDER}" = 'buildah' ] ; then
-    buildah bud --pull-always -t ${IMG}:${TAG} ${BUILD_ARGS} -f ${DOCKERFILE} .
+    BUILDAH_RUNTIME=runc buildah bud --pull-always -t ${IMG}:${TAG} ${BUILD_ARGS} -f ${DOCKERFILE} .
 else
     (>&2 echo "Unknown builder ${BUILDER}")
     exit 1

build/docker/intel-deviceplugin-operator.Dockerfile

@@ -27,8 +27,6 @@ RUN mkdir /install_root \
     --no-boot-update \
     && rm -rf /install_root/var/lib/swupd/*
 
-RUN mkdir -p /go/cache
-ENV GOCACHE=/go/cache
 RUN cd cmd/operator; GO111MODULE=${GO111MODULE} go install; cd -
 RUN chmod a+x /go/bin/operator \
     && install -D /go/bin/operator /install_root/usr/local/bin/intel_deviceplugin_operator \

build/docker/intel-dsa-plugin.Dockerfile

@@ -27,8 +27,6 @@ RUN mkdir /install_root \
     --no-boot-update \
     && rm -rf /install_root/var/lib/swupd/*
 
-RUN mkdir -p /go/cache
-ENV GOCACHE=/go/cache
 RUN cd cmd/dsa_plugin; GO111MODULE=${GO111MODULE} go install; cd -
 RUN chmod a+x /go/bin/dsa_plugin \
     && install -D /go/bin/dsa_plugin /install_root/usr/local/bin/intel_dsa_device_plugin \

build/docker/intel-fpga-admissionwebhook.Dockerfile

@@ -27,8 +27,6 @@ RUN mkdir /install_root \
     --no-boot-update \
     && rm -rf /install_root/var/lib/swupd/*
 
-RUN mkdir -p /go/cache
-ENV GOCACHE=/go/cache
 RUN cd cmd/fpga_admissionwebhook; GO111MODULE=${GO111MODULE} go install; cd -
 RUN chmod a+x /go/bin/fpga_admissionwebhook \
     && install -D /go/bin/fpga_admissionwebhook /install_root/usr/local/bin/intel_fpga_admissionwebhook \

build/docker/intel-fpga-initcontainer.Dockerfile

@@ -29,8 +29,6 @@ RUN mkdir /install_root \
     && rm -rf /install_root/var/lib/swupd/*
 
 # Build CRI Hook
-RUN mkdir -p /go/cache
-ENV GOCACHE=/go/cache
 RUN cd $DIR/cmd/fpga_crihook && \
     GO111MODULE=${GO111MODULE} go install && \
     chmod a+x /go/bin/fpga_crihook && \

build/docker/intel-fpga-plugin.Dockerfile

@@ -27,8 +27,6 @@ RUN mkdir /install_root \
     --no-boot-update \
     && rm -rf /install_root/var/lib/swupd/*
 
-RUN mkdir -p /go/cache
-ENV GOCACHE=/go/cache
 RUN cd cmd/fpga_plugin; GO111MODULE=${GO111MODULE} go install; cd -
 RUN chmod a+x /go/bin/fpga_plugin \
     && install -D /go/bin/fpga_plugin /install_root/usr/local/bin/intel_fpga_device_plugin \

build/docker/intel-gpu-initcontainer.Dockerfile

@@ -29,8 +29,6 @@ RUN mkdir /install_root \
     && rm -rf /install_root/var/lib/swupd/*
 
 # Build NFD Feature Detector Hook
-RUN mkdir -p /go/cache
-ENV GOCACHE=/go/cache
 RUN cd $DIR/cmd/gpu_nfdhook && \
     GO111MODULE=${GO111MODULE} go install -ldflags="-s -w" && \
     chmod a+x /go/bin/gpu_nfdhook && \

build/docker/intel-gpu-plugin.Dockerfile

@@ -27,8 +27,6 @@ RUN mkdir /install_root \
     --no-boot-update \
     && rm -rf /install_root/var/lib/swupd/*
 
-RUN mkdir -p /go/cache
-ENV GOCACHE=/go/cache
 RUN cd cmd/gpu_plugin; GO111MODULE=${GO111MODULE} go install; cd -
 RUN chmod a+x /go/bin/gpu_plugin \
     && install -D /go/bin/gpu_plugin /install_root/usr/local/bin/intel_gpu_device_plugin \

build/docker/intel-qat-plugin.Dockerfile

@@ -41,8 +41,6 @@ RUN test -z "${TAGS_KERNELDRV}" \
     && cd /usr/src/qat/quickassist/utilities/adf_ctl \
     && make KERNEL_SOURCE_DIR=/usr/src/qat/quickassist/qat \
     && install -D adf_ctl /install_root/usr/local/bin/adf_ctl )
-RUN mkdir -p /go/cache
-ENV GOCACHE=/go/cache
 RUN cd cmd/qat_plugin; echo "build tags: ${TAGS_KERNELDRV}"; GO111MODULE=${GO111MODULE} go install -tags "${TAGS_KERNELDRV}"; cd -
 RUN chmod a+x /go/bin/qat_plugin \
     && install -D /go/bin/qat_plugin /install_root/usr/local/bin/intel_qat_device_plugin \

build/docker/intel-sgx-initcontainer.Dockerfile

@@ -29,8 +29,6 @@ RUN mkdir /install_root \
     && rm -rf /install_root/var/lib/swupd/*
 
 # Build NFD Feature Detector Hook
-RUN mkdir -p /go/cache
-ENV GOCACHE=/go/cache
 RUN cd $DIR/cmd/sgx_epchook && \
     GO111MODULE=${GO111MODULE} go install && \
     chmod a+x /go/bin/sgx_epchook && \