From 6ab9e7089f7a2b062aafa144ff67d4f162898971 Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Fri, 26 Feb 2021 11:32:29 +0200 Subject: [PATCH] Revert "ci: workaround buildah errors" This reverts commit 6c02ff51fc53dc5608bed196b106d172b9452169. crun fails to build the images [1] but when setting BUILDAH_RUNTIME to runc the workaround is no longer needed. [1] https://github.com/containers/podman/issues/9378 Signed-off-by: Mikko Ylinen --- build/docker/intel-deviceplugin-operator.Dockerfile | 2 -- build/docker/intel-dsa-plugin.Dockerfile | 2 -- build/docker/intel-fpga-admissionwebhook.Dockerfile | 2 -- build/docker/intel-fpga-initcontainer.Dockerfile | 2 -- build/docker/intel-fpga-plugin.Dockerfile | 2 -- build/docker/intel-gpu-initcontainer.Dockerfile | 2 -- build/docker/intel-gpu-plugin.Dockerfile | 2 -- build/docker/intel-qat-plugin.Dockerfile | 2 -- build/docker/intel-sgx-initcontainer.Dockerfile | 2 -- build/docker/intel-sgx-plugin.Dockerfile | 2 -- build/docker/intel-vpu-plugin.Dockerfile | 2 -- 11 files changed, 22 deletions(-) diff --git a/build/docker/intel-deviceplugin-operator.Dockerfile b/build/docker/intel-deviceplugin-operator.Dockerfile index 08e6432c4..836adf90a 100644 --- a/build/docker/intel-deviceplugin-operator.Dockerfile +++ b/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 \ diff --git a/build/docker/intel-dsa-plugin.Dockerfile b/build/docker/intel-dsa-plugin.Dockerfile index b00b1e16e..9b8ee89c6 100644 --- a/build/docker/intel-dsa-plugin.Dockerfile +++ b/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 \ diff --git a/build/docker/intel-fpga-admissionwebhook.Dockerfile b/build/docker/intel-fpga-admissionwebhook.Dockerfile index b329f02a6..23efae93a 100644 --- a/build/docker/intel-fpga-admissionwebhook.Dockerfile +++ b/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 \ diff --git a/build/docker/intel-fpga-initcontainer.Dockerfile b/build/docker/intel-fpga-initcontainer.Dockerfile index 110872aa8..b5581995d 100644 --- a/build/docker/intel-fpga-initcontainer.Dockerfile +++ b/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 && \ diff --git a/build/docker/intel-fpga-plugin.Dockerfile b/build/docker/intel-fpga-plugin.Dockerfile index cae8135e2..bfdffd02f 100644 --- a/build/docker/intel-fpga-plugin.Dockerfile +++ b/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 \ diff --git a/build/docker/intel-gpu-initcontainer.Dockerfile b/build/docker/intel-gpu-initcontainer.Dockerfile index f70c29588..2e5a39df4 100644 --- a/build/docker/intel-gpu-initcontainer.Dockerfile +++ b/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 && \ diff --git a/build/docker/intel-gpu-plugin.Dockerfile b/build/docker/intel-gpu-plugin.Dockerfile index ae2e8bea0..210db7174 100644 --- a/build/docker/intel-gpu-plugin.Dockerfile +++ b/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 \ diff --git a/build/docker/intel-qat-plugin.Dockerfile b/build/docker/intel-qat-plugin.Dockerfile index a79b4ce26..b28078f7a 100644 --- a/build/docker/intel-qat-plugin.Dockerfile +++ b/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 \ diff --git a/build/docker/intel-sgx-initcontainer.Dockerfile b/build/docker/intel-sgx-initcontainer.Dockerfile index 2a159969e..928be09f3 100644 --- a/build/docker/intel-sgx-initcontainer.Dockerfile +++ b/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 && \ diff --git a/build/docker/intel-sgx-plugin.Dockerfile b/build/docker/intel-sgx-plugin.Dockerfile index e5b17338f..22a5ac40d 100644 --- a/build/docker/intel-sgx-plugin.Dockerfile +++ b/build/docker/intel-sgx-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/sgx_plugin; GO111MODULE=${GO111MODULE} go install; cd - RUN chmod a+x /go/bin/sgx_plugin \ && install -D /go/bin/sgx_plugin /install_root/usr/local/bin/intel_sgx_device_plugin \ diff --git a/build/docker/intel-vpu-plugin.Dockerfile b/build/docker/intel-vpu-plugin.Dockerfile index fc097567c..e610a28c5 100644 --- a/build/docker/intel-vpu-plugin.Dockerfile +++ b/build/docker/intel-vpu-plugin.Dockerfile @@ -25,8 +25,6 @@ ARG DIR=/intel-device-plugins-for-kubernetes ARG GO111MODULE=on WORKDIR $DIR COPY . . -RUN mkdir -p /go/cache -ENV GOCACHE=/go/cache RUN cd cmd/vpu_plugin; GO111MODULE=${GO111MODULE} go install; cd - RUN chmod a+x /go/bin/vpu_plugin \ && install -D /go/bin/vpu_plugin /install_root/usr/local/bin/intel_vpu_device_plugin \