Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

demo: opencl-icd: fix repo key install #1744

Merged
merged 2 commits into from
May 22, 2024
Merged

demo: opencl-icd: fix repo key install #1744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78d8aec
demo: opencl-icd: fix repo key install
tkatila May 22, 2024
18bd45f
Revert "revertme: upgrade unstable-slim demo images to update libc"
tkatila May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/lib-publish.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion demo/accel-config-demo/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions demo/crypto-perf/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:unstable-slim as builder
FROM debian:sid-slim as builder

ARG DIR=/dpdk-build
WORKDIR $DIR
Expand Down Expand Up @@ -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/

Expand Down
2 changes: 1 addition & 1 deletion demo/intel-opencl-icd/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion demo/opae-nlb-demo/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down