Skip to content

Commit 47e138a

Browse files
committed
Revert "ci: workaround buildah errors"
This reverts commit 6c02ff5. crun fails to build the images [1] but when setting BUILDAH_RUNTIME to runc the workaround is no longer needed. [1] containers/podman#9378 Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>
1 parent aee9dd2 commit 47e138a

11 files changed

+0
-22
lines changed

build/docker/intel-deviceplugin-operator.Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ RUN mkdir /install_root \
2727
--no-boot-update \
2828
&& rm -rf /install_root/var/lib/swupd/*
2929

30-
RUN mkdir -p /go/cache
31-
ENV GOCACHE=/go/cache
3230
RUN cd cmd/operator; GO111MODULE=${GO111MODULE} go install; cd -
3331
RUN chmod a+x /go/bin/operator \
3432
&& install -D /go/bin/operator /install_root/usr/local/bin/intel_deviceplugin_operator \

build/docker/intel-dsa-plugin.Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ RUN mkdir /install_root \
2727
--no-boot-update \
2828
&& rm -rf /install_root/var/lib/swupd/*
2929

30-
RUN mkdir -p /go/cache
31-
ENV GOCACHE=/go/cache
3230
RUN cd cmd/dsa_plugin; GO111MODULE=${GO111MODULE} go install; cd -
3331
RUN chmod a+x /go/bin/dsa_plugin \
3432
&& install -D /go/bin/dsa_plugin /install_root/usr/local/bin/intel_dsa_device_plugin \

build/docker/intel-fpga-admissionwebhook.Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ RUN mkdir /install_root \
2727
--no-boot-update \
2828
&& rm -rf /install_root/var/lib/swupd/*
2929

30-
RUN mkdir -p /go/cache
31-
ENV GOCACHE=/go/cache
3230
RUN cd cmd/fpga_admissionwebhook; GO111MODULE=${GO111MODULE} go install; cd -
3331
RUN chmod a+x /go/bin/fpga_admissionwebhook \
3432
&& install -D /go/bin/fpga_admissionwebhook /install_root/usr/local/bin/intel_fpga_admissionwebhook \

build/docker/intel-fpga-initcontainer.Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ RUN mkdir /install_root \
2929
&& rm -rf /install_root/var/lib/swupd/*
3030

3131
# Build CRI Hook
32-
RUN mkdir -p /go/cache
33-
ENV GOCACHE=/go/cache
3432
RUN cd $DIR/cmd/fpga_crihook && \
3533
GO111MODULE=${GO111MODULE} go install && \
3634
chmod a+x /go/bin/fpga_crihook && \

build/docker/intel-fpga-plugin.Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ RUN mkdir /install_root \
2727
--no-boot-update \
2828
&& rm -rf /install_root/var/lib/swupd/*
2929

30-
RUN mkdir -p /go/cache
31-
ENV GOCACHE=/go/cache
3230
RUN cd cmd/fpga_plugin; GO111MODULE=${GO111MODULE} go install; cd -
3331
RUN chmod a+x /go/bin/fpga_plugin \
3432
&& install -D /go/bin/fpga_plugin /install_root/usr/local/bin/intel_fpga_device_plugin \

build/docker/intel-gpu-initcontainer.Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ RUN mkdir /install_root \
2929
&& rm -rf /install_root/var/lib/swupd/*
3030

3131
# Build NFD Feature Detector Hook
32-
RUN mkdir -p /go/cache
33-
ENV GOCACHE=/go/cache
3432
RUN cd $DIR/cmd/gpu_nfdhook && \
3533
GO111MODULE=${GO111MODULE} go install -ldflags="-s -w" && \
3634
chmod a+x /go/bin/gpu_nfdhook && \

build/docker/intel-gpu-plugin.Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ RUN mkdir /install_root \
2727
--no-boot-update \
2828
&& rm -rf /install_root/var/lib/swupd/*
2929

30-
RUN mkdir -p /go/cache
31-
ENV GOCACHE=/go/cache
3230
RUN cd cmd/gpu_plugin; GO111MODULE=${GO111MODULE} go install; cd -
3331
RUN chmod a+x /go/bin/gpu_plugin \
3432
&& install -D /go/bin/gpu_plugin /install_root/usr/local/bin/intel_gpu_device_plugin \

build/docker/intel-qat-plugin.Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ RUN test -z "${TAGS_KERNELDRV}" \
4141
&& cd /usr/src/qat/quickassist/utilities/adf_ctl \
4242
&& make KERNEL_SOURCE_DIR=/usr/src/qat/quickassist/qat \
4343
&& install -D adf_ctl /install_root/usr/local/bin/adf_ctl )
44-
RUN mkdir -p /go/cache
45-
ENV GOCACHE=/go/cache
4644
RUN cd cmd/qat_plugin; echo "build tags: ${TAGS_KERNELDRV}"; GO111MODULE=${GO111MODULE} go install -tags "${TAGS_KERNELDRV}"; cd -
4745
RUN chmod a+x /go/bin/qat_plugin \
4846
&& install -D /go/bin/qat_plugin /install_root/usr/local/bin/intel_qat_device_plugin \

build/docker/intel-sgx-initcontainer.Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ RUN mkdir /install_root \
2929
&& rm -rf /install_root/var/lib/swupd/*
3030

3131
# Build NFD Feature Detector Hook
32-
RUN mkdir -p /go/cache
33-
ENV GOCACHE=/go/cache
3432
RUN cd $DIR/cmd/sgx_epchook && \
3533
GO111MODULE=${GO111MODULE} go install && \
3634
chmod a+x /go/bin/sgx_epchook && \

build/docker/intel-sgx-plugin.Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ RUN mkdir /install_root \
2727
--no-boot-update \
2828
&& rm -rf /install_root/var/lib/swupd/*
2929

30-
RUN mkdir -p /go/cache
31-
ENV GOCACHE=/go/cache
3230
RUN cd cmd/sgx_plugin; GO111MODULE=${GO111MODULE} go install; cd -
3331
RUN chmod a+x /go/bin/sgx_plugin \
3432
&& install -D /go/bin/sgx_plugin /install_root/usr/local/bin/intel_sgx_device_plugin \

0 commit comments

Comments
 (0)