From 70c9a550295b4a82bbab9bbf474d389aa585a810 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Thu, 11 Aug 2022 18:59:37 +0300 Subject: [PATCH] fpga,dsa,iaa: Fix CI issue Due to a glibc version mismatch in the debian repos and the unstable-slim docker image 3 CI jobs have been failing last several days. Using testing-slim image as a base should fix the issue. --- build/docker/intel-idxd-config-initcontainer.Dockerfile | 4 ++-- .../templates/intel-idxd-config-initcontainer.Dockerfile.in | 4 ++-- demo/opae-nlb-demo/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/docker/intel-idxd-config-initcontainer.Dockerfile b/build/docker/intel-idxd-config-initcontainer.Dockerfile index 91453ff3..1016c3d1 100644 --- a/build/docker/intel-idxd-config-initcontainer.Dockerfile +++ b/build/docker/intel-idxd-config-initcontainer.Dockerfile @@ -14,7 +14,7 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ### -FROM debian:unstable-slim AS builder +FROM debian:testing-slim AS builder RUN echo "deb-src http://deb.debian.org/debian unstable main" >> /etc/apt/sources.list.d/deb-src.list && apt update && apt install -y --no-install-recommends gcc make patch autoconf automake libtool pkg-config libjson-c-dev uuid-dev curl ca-certificates ARG ACCEL_CONFIG_VERSION="3.4.6.4" ARG ACCEL_CONFIG_DOWNLOAD_URL="https://github.com/intel/idxd-config/archive/accel-config-v$ACCEL_CONFIG_VERSION.tar.gz" @@ -22,7 +22,7 @@ ARG ACCEL_CONFIG_SHA256="5f9ee68f51913d803b9b0e51cdadaff14ea1523f6e9e4d4ab3e85de RUN curl -fsSL "$ACCEL_CONFIG_DOWNLOAD_URL" -o accel-config.tar.gz && echo "$ACCEL_CONFIG_SHA256 accel-config.tar.gz" | sha256sum -c - && tar -xzf accel-config.tar.gz RUN cd idxd-config-accel-config-v$ACCEL_CONFIG_VERSION && ./git-version-gen && autoreconf -i && ./configure -q --libdir=/usr/lib64 --disable-test --disable-docs && make && make install ### -FROM debian:unstable-slim +FROM debian:testing-slim RUN apt update && apt install -y libjson-c5 jq COPY --from=builder /usr/lib64/libaccel-config.so.1.0.0 "/lib/x86_64-linux-gnu/" RUN ldconfig && mkdir -p /licenses/accel-config diff --git a/build/docker/templates/intel-idxd-config-initcontainer.Dockerfile.in b/build/docker/templates/intel-idxd-config-initcontainer.Dockerfile.in index e38d8140..f7c25410 100644 --- a/build/docker/templates/intel-idxd-config-initcontainer.Dockerfile.in +++ b/build/docker/templates/intel-idxd-config-initcontainer.Dockerfile.in @@ -1,4 +1,4 @@ -FROM debian:unstable-slim AS builder +FROM debian:testing-slim AS builder RUN echo "deb-src http://deb.debian.org/debian unstable main" >> \ /etc/apt/sources.list.d/deb-src.list && \ @@ -21,7 +21,7 @@ RUN cd idxd-config-accel-config-v$ACCEL_CONFIG_VERSION && \ make && \ make install ### -FROM debian:unstable-slim +FROM debian:testing-slim RUN apt update && apt install -y libjson-c5 jq diff --git a/demo/opae-nlb-demo/Dockerfile b/demo/opae-nlb-demo/Dockerfile index 5c04e738..aa601b11 100644 --- a/demo/opae-nlb-demo/Dockerfile +++ b/demo/opae-nlb-demo/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:unstable-slim AS builder +FROM debian:testing-slim AS builder # Install build dependencies RUN apt-get update && apt-get install -y curl python3-dev git gcc g++ make cmake uuid-dev libjson-c-dev libedit-dev libudev-dev @@ -23,7 +23,7 @@ RUN cd /usr/src/opae/opae-sdk-${OPAE_RELEASE} && \ make -j xfpga nlb0 nlb3 -FROM debian:unstable-slim +FROM debian:testing-slim RUN apt-get update && apt-get install -y libjson-c5