Merge pull request #1332 from mythi/PR-2023-010

images: move to Debian packaged accel-config

build/docker/intel-idxd-config-initcontainer.Dockerfile

@@ -14,21 +14,8 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ###
-FROM debian:unstable-slim AS builder
-RUN apt-get update && apt-get 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.5.2"
-ARG ACCEL_CONFIG_DOWNLOAD_URL="https://github.com/intel/idxd-config/archive/accel-config-v$ACCEL_CONFIG_VERSION.tar.gz"
-ARG ACCEL_CONFIG_SHA256="a2d52007b4bfdc050a21893466e78328c6800f9a87b0806c7e7f5775ff48387b"
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-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
-RUN apt-get update && apt-get install -y --no-install-recommends libjson-c5 jq && rm -rf /var/lib/apt/lists/\*
+RUN apt-get update && apt-get install -y --no-install-recommends accel-config jq && rm -rf /var/lib/apt/lists/\*
-COPY --from=builder /usr/lib64/libaccel-config.so.1.0.0 "/lib/x86_64-linux-gnu/"
-RUN ldconfig && mkdir -p /licenses/accel-config
-COPY --from=builder /usr/bin/accel-config /usr/bin/
-COPY --from=builder /accel-config.tar.gz /licenses/accel-config/
 COPY demo/idxd-init.sh /usr/local/bin/
 COPY demo/dsa.conf /idxd-init/
 COPY demo/iaa.conf /idxd-init/

build/docker/templates/intel-idxd-config-initcontainer.Dockerfile.in

@@ -1,35 +1,6 @@
-FROM debian:unstable-slim AS builder
-
-RUN apt-get update && apt-get 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.5.2"
-ARG ACCEL_CONFIG_DOWNLOAD_URL="https://github.com/intel/idxd-config/archive/accel-config-v$ACCEL_CONFIG_VERSION.tar.gz"
-ARG ACCEL_CONFIG_SHA256="a2d52007b4bfdc050a21893466e78328c6800f9a87b0806c7e7f5775ff48387b"
-
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-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
 
-RUN apt-get update && apt-get install -y --no-install-recommends libjson-c5 jq && rm -rf /var/lib/apt/lists/\*
+RUN apt-get update && apt-get install -y --no-install-recommends accel-config jq && rm -rf /var/lib/apt/lists/\*
-
-COPY --from=builder /usr/lib64/libaccel-config.so.1.0.0 "/lib/x86_64-linux-gnu/"
-RUN ldconfig && mkdir -p /licenses/accel-config
-
-COPY --from=builder /usr/bin/accel-config /usr/bin/
-COPY --from=builder /accel-config.tar.gz /licenses/accel-config/
 
 COPY demo/idxd-init.sh /usr/local/bin/
 COPY demo/dsa.conf /idxd-init/

demo/crypto-perf/Dockerfile

@@ -5,7 +5,7 @@ WORKDIR $DIR
 
 RUN echo "deb-src http://deb.debian.org/debian unstable main" >> \
     /etc/apt/sources.list.d/deb-src.list
-RUN apt-get update && apt-get install -y wget build-essential meson python3-pyelftools libnuma-dev python3-pip libssl-dev pkg-config dpkg-dev
+RUN apt-get update && apt-get install -y --no-install-recommends wget build-essential meson ninja-build python3-pyelftools libnuma-dev python3-pip libssl-dev pkg-config dpkg-dev
 
 # Download & unpack DPDK tarball
 ARG DPDK_TARBALL=dpdk-22.11.tar.xz
@@ -38,7 +38,7 @@ RUN mkdir -p /install_root/licenses/dpdk && \
     apt-get source --download-only -y libatomic1 libnuma1
 
 FROM debian:sid-slim
-RUN apt-get update && apt-get install -y libssl3 libnuma1 libatomic1 && ldconfig -v
+RUN apt-get update && apt-get install -y --no-install-recommends libssl3 libnuma1 libatomic1 && ldconfig -v
 COPY --from=builder /install_root /
 COPY run-dpdk-test /usr/bin/
 

demo/dlb-dpdk-demo/Dockerfile

@@ -3,7 +3,7 @@ FROM ubuntu:20.04 as builder
 ARG DIR=/dpdk-build
 WORKDIR $DIR
 
-RUN apt-get update && apt-get install -y wget build-essential meson python3-pyelftools libnuma-dev python3-pip
+RUN apt-get update && apt-get install -y --no-install-recommends wget build-essential meson ninja-build python3-pyelftools libnuma-dev python3-pip
 
 # Download & unpack DLB tarball
 ARG DLB_TARBALL="dlb_linux_src_release8.0.0.txz"
@@ -25,7 +25,7 @@ RUN cd dpdk-* && patch -Np1 < $(echo ../dlb/dpdk/dpdk_dlb_*.patch) && sed -i 's/
 RUN cd dpdk-* && ninja -C builddir install && install -D builddir/app/dpdk-test-eventdev /install_root/usr/bin/dpdk-test-eventdev
 
 FROM ubuntu:20.04
-RUN apt-get update && apt-get install -y libnuma1 libatomic1
+RUN apt-get update && apt-get install -y --no-install-recommends libnuma1 libatomic1
 COPY --from=builder /install_root /
 COPY test.sh /usr/bin/