Skip to content

Commit 18bd45f

Browse files
committed
Revert "revertme: upgrade unstable-slim demo images to update libc"
This reverts commit 569d06d.
1 parent 78d8aec commit 18bd45f

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.github/workflows/lib-publish.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ jobs:
3939
- intel-xpumanager-sidecar
4040

4141
# # Demo images
42-
#- crypto-perf
43-
#- opae-nlb-demo
42+
- crypto-perf
43+
- opae-nlb-demo
4444
steps:
4545
- uses: actions/checkout@v4
4646
- uses: actions/setup-go@v5

demo/accel-config-demo/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ RUN cd / && git clone --recurse-submodules --depth 1 --branch v1.5.0 https://git
3131

3232
FROM debian:unstable-slim
3333

34-
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/\*
34+
RUN apt-get update && apt-get install -y --no-install-recommends pciutils accel-config accel-config-test && rm -rf /var/lib/apt/lists/\*
3535

3636
RUN sed -i -e '420,429d;480,489d' /usr/libexec/accel-config/test/iaa_user_test_runner.sh
3737
COPY --from=builder /usr/local /usr/local

demo/crypto-perf/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:unstable-slim as builder
1+
FROM debian:sid-slim as builder
22

33
ARG DIR=/dpdk-build
44
WORKDIR $DIR
@@ -37,8 +37,8 @@ RUN mkdir -p /install_root/licenses/dpdk && \
3737
cd /install_root/licenses/dpdk && \
3838
apt-get source --download-only -y libatomic1 libnuma1
3939

40-
FROM debian:unstable-slim
41-
RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends libipsec-mb1 libnuma1 libatomic1 && ldconfig -v
40+
FROM debian:sid-slim
41+
RUN apt-get update && apt-get install -y --no-install-recommends libipsec-mb1 libnuma1 libatomic1 && ldconfig -v
4242
COPY --from=builder /install_root /
4343
COPY run-dpdk-test /usr/bin/
4444

demo/opae-nlb-demo/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN cd /usr/src/opae/opae-sdk-${OPAE_RELEASE} && \
2626

2727
FROM debian:unstable-slim
2828

29-
RUN apt-get update && apt-get upgrade -y && apt-get install --no-install-recommends -y libjson-c5
29+
RUN apt-get update && apt-get install --no-install-recommends -y libjson-c5
3030

3131
# Copy required nlb* utils and their dependencies to the final image
3232
COPY --from=builder /usr/src/opae/opae-sdk-*/build/bin/nlb* /usr/local/bin/

0 commit comments

Comments
 (0)