Merge pull request #1282 from mythi/PR-2022-081

demo: update accel-config 3.5.2

Author: bart0sh

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

@@ -16,9 +16,9 @@
 ###
 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.0"
+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="4d2fecbbb29f293791214f475c44e73c25171f75c1725dbc516731b768e2e7c9"
+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

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

@@ -5,9 +5,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     automake libtool pkg-config \
     libjson-c-dev uuid-dev curl ca-certificates
 
-ARG ACCEL_CONFIG_VERSION="3.5.0"
+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="4d2fecbbb29f293791214f475c44e73c25171f75c1725dbc516731b768e2e7c9"
+ARG ACCEL_CONFIG_SHA256="a2d52007b4bfdc050a21893466e78328c6800f9a87b0806c7e7f5775ff48387b"
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN curl -fsSL "$ACCEL_CONFIG_DOWNLOAD_URL" -o accel-config.tar.gz && \

demo/accel-config-demo/Dockerfile

@@ -12,15 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ubuntu:20.04 AS builder
+FROM ubuntu:22.04 AS builder
 
 RUN apt update && apt install -y --no-install-recommends \
     gcc make patch autoconf automake libtool pkg-config curl ca-certificates \
     libjson-c-dev uuid-dev zlib1g-dev
 
-ARG ACCEL_CONFIG_VERSION="3.5.0"
+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="4d2fecbbb29f293791214f475c44e73c25171f75c1725dbc516731b768e2e7c9"
+ARG ACCEL_CONFIG_SHA256="a2d52007b4bfdc050a21893466e78328c6800f9a87b0806c7e7f5775ff48387b"
 
 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
 
@@ -35,9 +35,9 @@ RUN cd idxd-config-accel-config-v$ACCEL_CONFIG_VERSION && \
     ./configure -q --libdir=/usr/lib64 --enable-test=yes --disable-docs && \
     make install
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
-RUN apt update && apt install -y libjson-c4
+RUN apt update && apt install -y libjson-c5
 
 COPY --from=builder /usr/lib64/libaccel-config.so.1.0.0 "/lib/x86_64-linux-gnu/"
 RUN ldconfig