revertme: upgrade unstable-slim demo images to update libc

Workaround for libc updating during compilation (vs. base image)
Also stop image publish for these images for the time being.

Signed-off-by: Tuomas Katila <tuomas.katila@intel.com>
This commit is contained in:
Tuomas Katila 2024-05-06 14:04:16 +03:00
parent e89955435a
commit 569d06debb
4 changed files with 7 additions and 7 deletions

View File

@ -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

View File

@ -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 install -y --no-install-recommends pciutils accel-config accel-config-test && rm -rf /var/lib/apt/lists/\*
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 sed -i -e '420,429d;480,489d' /usr/libexec/accel-config/test/iaa_user_test_runner.sh
COPY --from=builder /usr/local /usr/local

View File

@ -1,4 +1,4 @@
FROM debian:sid-slim as builder
FROM debian:unstable-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:sid-slim
RUN apt-get update && apt-get install -y --no-install-recommends libipsec-mb1 libnuma1 libatomic1 && ldconfig -v
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
COPY --from=builder /install_root /
COPY run-dpdk-test /usr/bin/

View File

@ -26,7 +26,7 @@ RUN cd /usr/src/opae/opae-sdk-${OPAE_RELEASE} && \
FROM debian:unstable-slim
RUN apt-get update && apt-get install --no-install-recommends -y libjson-c5
RUN apt-get update && apt-get upgrade -y && 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/