Skip to content

Commit a0416c7

Browse files
mythimythi
committed
images: move to Debian packaged accel-config
Signed-off-by: Mikko Ylinen <[email protected]>
1 parent f559d87 commit a0416c7

File tree

5 files changed

+12
-101
lines changed

5 files changed

+12
-101
lines changed

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

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,8 @@
1414
## See the License for the specific language governing permissions and
1515
## limitations under the License.
1616
###
17-
FROM debian:unstable-slim AS builder
18-
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
19-
ARG ACCEL_CONFIG_VERSION="3.5.2"
20-
ARG ACCEL_CONFIG_DOWNLOAD_URL="https://github.com/intel/idxd-config/archive/accel-config-v$ACCEL_CONFIG_VERSION.tar.gz"
21-
ARG ACCEL_CONFIG_SHA256="a2d52007b4bfdc050a21893466e78328c6800f9a87b0806c7e7f5775ff48387b"
22-
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
23-
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
24-
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
25-
###
2617
FROM debian:unstable-slim
27-
RUN apt-get update && apt-get install -y --no-install-recommends libjson-c5 jq && rm -rf /var/lib/apt/lists/\*
28-
COPY --from=builder /usr/lib64/libaccel-config.so.1.0.0 "/lib/x86_64-linux-gnu/"
29-
RUN ldconfig && mkdir -p /licenses/accel-config
30-
COPY --from=builder /usr/bin/accel-config /usr/bin/
31-
COPY --from=builder /accel-config.tar.gz /licenses/accel-config/
18+
RUN apt-get update && apt-get install -y --no-install-recommends accel-config jq && rm -rf /var/lib/apt/lists/\*
3219
COPY demo/idxd-init.sh /usr/local/bin/
3320
COPY demo/dsa.conf /idxd-init/
3421
COPY demo/iaa.conf /idxd-init/

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

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,6 @@
1-
FROM debian:unstable-slim AS builder
2-
3-
RUN apt-get update && apt-get install -y --no-install-recommends \
4-
gcc make patch autoconf \
5-
automake libtool pkg-config \
6-
libjson-c-dev uuid-dev curl ca-certificates
7-
8-
ARG ACCEL_CONFIG_VERSION="3.5.2"
9-
ARG ACCEL_CONFIG_DOWNLOAD_URL="https://github.com/intel/idxd-config/archive/accel-config-v$ACCEL_CONFIG_VERSION.tar.gz"
10-
ARG ACCEL_CONFIG_SHA256="a2d52007b4bfdc050a21893466e78328c6800f9a87b0806c7e7f5775ff48387b"
11-
12-
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
13-
RUN curl -fsSL "$ACCEL_CONFIG_DOWNLOAD_URL" -o accel-config.tar.gz && \
14-
echo "$ACCEL_CONFIG_SHA256 accel-config.tar.gz" | sha256sum -c - && \
15-
tar -xzf accel-config.tar.gz
16-
17-
RUN cd idxd-config-accel-config-v$ACCEL_CONFIG_VERSION && \
18-
./git-version-gen && \
19-
autoreconf -i && \
20-
./configure -q --libdir=/usr/lib64 --disable-test --disable-docs && \
21-
make && \
22-
make install
23-
###
241
FROM debian:unstable-slim
252

26-
RUN apt-get update && apt-get install -y --no-install-recommends libjson-c5 jq && rm -rf /var/lib/apt/lists/\*
27-
28-
COPY --from=builder /usr/lib64/libaccel-config.so.1.0.0 "/lib/x86_64-linux-gnu/"
29-
RUN ldconfig && mkdir -p /licenses/accel-config
30-
31-
COPY --from=builder /usr/bin/accel-config /usr/bin/
32-
COPY --from=builder /accel-config.tar.gz /licenses/accel-config/
3+
RUN apt-get update && apt-get install -y --no-install-recommends accel-config jq && rm -rf /var/lib/apt/lists/\*
334

345
COPY demo/idxd-init.sh /usr/local/bin/
356
COPY demo/dsa.conf /idxd-init/

‎demo/accel-config-demo/Dockerfile

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,11 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM ubuntu:22.04 AS builder
15+
FROM debian:unstable-slim AS builder
1616

1717
RUN apt-get update && apt-get install -y --no-install-recommends \
1818
gcc g++ nasm make cmake patch autoconf automake libtool pkg-config git curl ca-certificates \
19-
libjson-c-dev uuid-dev zlib1g-dev
20-
21-
ARG ACCEL_CONFIG_VERSION="3.5.2"
22-
ARG ACCEL_CONFIG_DOWNLOAD_URL="https://github.com/intel/idxd-config/archive/accel-config-v$ACCEL_CONFIG_VERSION.tar.gz"
23-
ARG ACCEL_CONFIG_SHA256="a2d52007b4bfdc050a21893466e78328c6800f9a87b0806c7e7f5775ff48387b"
24-
25-
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
26-
27-
COPY idxd-reset.patch /
28-
COPY test_runner_disable_shared_queues.patch /
29-
30-
RUN cd idxd-config-accel-config-v$ACCEL_CONFIG_VERSION && \
31-
patch -p1 < ../idxd-reset.patch && \
32-
patch -p1 < ../test_runner_disable_shared_queues.patch && \
33-
./git-version-gen && \
34-
autoreconf -i && \
35-
./configure -q --libdir=/usr/lib64 --enable-test=yes --disable-docs && \
36-
make install
19+
uuid-dev zlib1g-dev libaccel-config-dev
3720

3821
COPY dml.patch /
3922
RUN cd / && git clone --recurse-submodules --branch v0.1.9-beta --depth 1 https://github.com/intel/DML.git && \
@@ -51,17 +34,13 @@ RUN cd / && git clone --recursive --depth 1 --branch v1.0.0 https://github.com/i
5134
cmake -DLOG_HW_INIT=ON .. && \
5235
make install
5336

54-
FROM ubuntu:22.04
55-
56-
RUN apt-get update && apt-get install -y --no-install-recommends libjson-c5 && rm -rf /var/lib/apt/lists/\*
37+
FROM debian:unstable-slim
5738

58-
COPY --from=builder /usr/lib64/libaccel-config.so.1.0.0 "/lib/x86_64-linux-gnu/"
59-
RUN ldconfig
39+
RUN apt-get update && apt-get install -y --no-install-recommends accel-config-test patch && rm -rf /var/lib/apt/lists/\*
6040

61-
COPY --from=builder /usr/bin/accel-config /usr/bin/
62-
COPY --from=builder /usr/lib/accel-config/test /test
63-
COPY --from=builder /idxd-reset.patch /usr/local/share/package-sources/
41+
COPY test_runner_disable_shared_queues.patch /usr/libexec
6442

43+
RUN cd /usr/libexec && patch -p0 < test_runner_disable_shared_queues.patch && rm *.patch
6544
COPY --from=builder /usr/local /usr/local
6645
COPY --from=builder /qpl/build/examples /usr/local/bin/
6746

‎demo/accel-config-demo/idxd-reset.patch

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎demo/accel-config-demo/test_runner_disable_shared_queues.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- idxd-config-accel-config-v3.5.2/test/dsa_user_test_runner.sh.orig 2022-11-29 12:41:55.188306049 +0200
2-
+++ idxd-config-accel-config-v3.5.2/test/dsa_user_test_runner.sh 2022-11-29 12:44:20.711820711 +0200
1+
--- accel-config/test/dsa_user_test_runner.sh.orig 2022-11-29 12:41:55.188306049 +0200
2+
+++ accel-config/test/dsa_user_test_runner.sh 2022-11-29 12:44:20.711820711 +0200
33
@@ -6,7 +6,8 @@
44

55
rc="$EXIT_SKIP"
@@ -60,8 +60,8 @@
6060
-stop_dsa
6161
-_cleanup
6262
-exit 0
63-
--- idxd-config-accel-config-v3.5.2/test/iaa_user_test_runner.sh.orig 2022-11-29 12:41:55.188306049 +0200
64-
+++ idxd-config-accel-config-v3.5.2/test/iaa_user_test_runner.sh 2022-11-29 12:44:20.711820711 +0200
63+
--- accel-config/test/iaa_user_test_runner.sh.orig 2022-11-29 12:41:55.188306049 +0200
64+
+++ accel-config/test/iaa_user_test_runner.sh 2022-11-29 12:44:20.711820711 +0200
6565
@@ -6,7 +6,8 @@
6666

6767
rc="$EXIT_SKIP"

0 commit comments

Comments
 (0)