From 7857897f31b6116abb241829c1fd1587b30d3460 Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Tue, 14 Feb 2023 08:31:53 +0200 Subject: [PATCH 1/2] images: move to Debian packaged accel-config Signed-off-by: Mikko Ylinen --- ...intel-idxd-config-initcontainer.Dockerfile | 15 +-------- ...el-idxd-config-initcontainer.Dockerfile.in | 31 +------------------ 2 files changed, 2 insertions(+), 44 deletions(-) diff --git a/build/docker/intel-idxd-config-initcontainer.Dockerfile b/build/docker/intel-idxd-config-initcontainer.Dockerfile index 223e218d..ac917f86 100644 --- a/build/docker/intel-idxd-config-initcontainer.Dockerfile +++ b/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/\* -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/ +RUN apt-get update && apt-get install -y --no-install-recommends accel-config jq && rm -rf /var/lib/apt/lists/\* COPY demo/idxd-init.sh /usr/local/bin/ COPY demo/dsa.conf /idxd-init/ COPY demo/iaa.conf /idxd-init/ diff --git a/build/docker/templates/intel-idxd-config-initcontainer.Dockerfile.in b/build/docker/templates/intel-idxd-config-initcontainer.Dockerfile.in index 7b171d29..4e4e17a9 100644 --- a/build/docker/templates/intel-idxd-config-initcontainer.Dockerfile.in +++ b/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/\* - -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/ +RUN apt-get update && apt-get install -y --no-install-recommends accel-config jq && rm -rf /var/lib/apt/lists/\* COPY demo/idxd-init.sh /usr/local/bin/ COPY demo/dsa.conf /idxd-init/ From a5f800068cccd5ef28d1a3fb6d9d367f60c2a5ad Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Tue, 14 Feb 2023 09:00:41 +0200 Subject: [PATCH 2/2] demo: do not install recommended packages in DPDK images Signed-off-by: Mikko Ylinen --- demo/crypto-perf/Dockerfile | 4 ++-- demo/dlb-dpdk-demo/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/demo/crypto-perf/Dockerfile b/demo/crypto-perf/Dockerfile index 0c50dd11..0ab10cba 100644 --- a/demo/crypto-perf/Dockerfile +++ b/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/ diff --git a/demo/dlb-dpdk-demo/Dockerfile b/demo/dlb-dpdk-demo/Dockerfile index f47055eb..099c4f09 100644 --- a/demo/dlb-dpdk-demo/Dockerfile +++ b/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/