Merge pull request #1744 from tkatila/fix-gpu-opencl-icd-image

demo: opencl-icd: fix repo key install
intel · May 22, 2024 · 86f0d0f · 86f0d0f
2 parents 0549558 + 18bd45f
commit 86f0d0f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/lib-publish.yaml b/.github/workflows/lib-publish.yaml
@@ -39,8 +39,8 @@ jobs:
           - intel-xpumanager-sidecar
 
           # # Demo images
-          #- crypto-perf
-          #- opae-nlb-demo
+          - crypto-perf
+          - opae-nlb-demo
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5

diff --git a/demo/accel-config-demo/Dockerfile b/demo/accel-config-demo/Dockerfile
@@ -31,7 +31,7 @@ RUN cd / && git clone --recurse-submodules --depth 1 --branch v1.5.0 https://git
 
 FROM debian:unstable-slim
 
-RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends pciutils accel-config accel-config-test kmod && rm -rf /var/lib/apt/lists/\*
+RUN apt-get update && apt-get install -y --no-install-recommends pciutils accel-config accel-config-test && rm -rf /var/lib/apt/lists/\*
 
 RUN sed -i -e '420,429d;480,489d' /usr/libexec/accel-config/test/iaa_user_test_runner.sh
 COPY --from=builder /usr/local /usr/local

diff --git a/demo/crypto-perf/Dockerfile b/demo/crypto-perf/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:unstable-slim as builder
+FROM debian:sid-slim as builder
 
 ARG DIR=/dpdk-build
 WORKDIR $DIR
@@ -37,8 +37,8 @@ RUN mkdir -p /install_root/licenses/dpdk && \
     cd /install_root/licenses/dpdk && \
     apt-get source --download-only -y libatomic1 libnuma1
 
-FROM debian:unstable-slim
-RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends libipsec-mb1 libnuma1 libatomic1 && ldconfig -v
+FROM debian:sid-slim
+RUN apt-get update && apt-get install -y --no-install-recommends libipsec-mb1 libnuma1 libatomic1 && ldconfig -v
 COPY --from=builder /install_root /
 COPY run-dpdk-test /usr/bin/
 

diff --git a/demo/intel-opencl-icd/Dockerfile b/demo/intel-opencl-icd/Dockerfile
@@ -5,7 +5,7 @@ ARG APT="env DEBIAN_FRONTEND=noninteractive apt"
 RUN ${APT} update && ${APT} install -y curl gpg-agent \
     && echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/gpu/ubuntu jammy/lts/2350 unified' | \
        tee -a /etc/apt/sources.list.d/intel.list \
-    && curl -s https://repositories.intel.com/graphics/intel-graphics.key | \
+    && curl -s https://repositories.intel.com/gpu/intel-graphics.key | \
        gpg --dearmor --output /usr/share/keyrings/intel-graphics.gpg \
     && ${APT} update \
     && ${APT} install -y --no-install-recommends \

diff --git a/demo/opae-nlb-demo/Dockerfile b/demo/opae-nlb-demo/Dockerfile
@@ -26,7 +26,7 @@ RUN cd /usr/src/opae/opae-sdk-${OPAE_RELEASE} && \
 
 FROM debian:unstable-slim
 
-RUN apt-get update && apt-get upgrade -y && apt-get install --no-install-recommends -y libjson-c5
+RUN apt-get update && apt-get install --no-install-recommends -y libjson-c5
 
 # Copy required nlb* utils and their dependencies to the final image
 COPY --from=builder /usr/src/opae/opae-sdk-*/build/bin/nlb* /usr/local/bin/