From 0706b5fbc69e838b875bcbfd3b4987818921f69d Mon Sep 17 00:00:00 2001 From: Hyeongju Johannes Lee Date: Mon, 4 Dec 2023 06:51:40 -0800 Subject: [PATCH] dlb, idxd, qat: install LICENSE to initcontainer Signed-off-by: Hyeongju Johannes Lee --- build/docker/intel-dlb-initcontainer.Dockerfile | 1 + build/docker/intel-idxd-config-initcontainer.Dockerfile | 1 + build/docker/intel-qat-initcontainer.Dockerfile | 1 + build/docker/templates/intel-dlb-initcontainer.Dockerfile.in | 1 + .../templates/intel-idxd-config-initcontainer.Dockerfile.in | 1 + build/docker/templates/intel-qat-initcontainer.Dockerfile.in | 1 + 6 files changed, 6 insertions(+) diff --git a/build/docker/intel-dlb-initcontainer.Dockerfile b/build/docker/intel-dlb-initcontainer.Dockerfile index 99436224..7e89bdea 100644 --- a/build/docker/intel-dlb-initcontainer.Dockerfile +++ b/build/docker/intel-dlb-initcontainer.Dockerfile @@ -39,6 +39,7 @@ FROM ${GOLANG_BASE} as builder ARG DIR=/intel-device-plugins-for-kubernetes WORKDIR $DIR COPY . . +RUN install -D ${DIR}/LICENSE /install_root/licenses/intel-device-plugins-for-kubernetes/LICENSE ARG TOYBOX_VERSION="0.8.10" ARG TOYBOX_SHA256="3c31e235fe87e74e6c6cf7cd7299fcbffb0f4a4834dae607aa26bb4f1583549a" ARG ROOT=/install_root diff --git a/build/docker/intel-idxd-config-initcontainer.Dockerfile b/build/docker/intel-idxd-config-initcontainer.Dockerfile index 4afbc60f..f11a5845 100644 --- a/build/docker/intel-idxd-config-initcontainer.Dockerfile +++ b/build/docker/intel-idxd-config-initcontainer.Dockerfile @@ -15,6 +15,7 @@ ## limitations under the License. ### FROM debian:unstable-slim +COPY ./LICENSE /licenses/intel-device-plugins-for-kubernetes/LICENSE RUN apt-get update && apt-get install -y --no-install-recommends accel-config jq && rm -rf /var/lib/apt/lists/\* COPY demo/idxd-init.sh /usr/local/bin/ COPY demo/dsa.conf /idxd-init/ diff --git a/build/docker/intel-qat-initcontainer.Dockerfile b/build/docker/intel-qat-initcontainer.Dockerfile index c130615b..3dc051a0 100644 --- a/build/docker/intel-qat-initcontainer.Dockerfile +++ b/build/docker/intel-qat-initcontainer.Dockerfile @@ -39,6 +39,7 @@ FROM ${GOLANG_BASE} as builder ARG DIR=/intel-device-plugins-for-kubernetes WORKDIR $DIR COPY . . +RUN install -D ${DIR}/LICENSE /install_root/licenses/intel-device-plugins-for-kubernetes/LICENSE ARG TOYBOX_VERSION="0.8.10" ARG TOYBOX_SHA256="3c31e235fe87e74e6c6cf7cd7299fcbffb0f4a4834dae607aa26bb4f1583549a" ARG ROOT=/install_root diff --git a/build/docker/templates/intel-dlb-initcontainer.Dockerfile.in b/build/docker/templates/intel-dlb-initcontainer.Dockerfile.in index 9a446ee9..dbcf847f 100644 --- a/build/docker/templates/intel-dlb-initcontainer.Dockerfile.in +++ b/build/docker/templates/intel-dlb-initcontainer.Dockerfile.in @@ -7,6 +7,7 @@ ARG DIR=/intel-device-plugins-for-kubernetes WORKDIR $DIR COPY . . +RUN install -D ${DIR}/LICENSE /install_root/licenses/intel-device-plugins-for-kubernetes/LICENSE #include "toybox_build.docker" FROM ${FINAL_BASE} diff --git a/build/docker/templates/intel-idxd-config-initcontainer.Dockerfile.in b/build/docker/templates/intel-idxd-config-initcontainer.Dockerfile.in index d2791bb4..fa60da01 100644 --- a/build/docker/templates/intel-idxd-config-initcontainer.Dockerfile.in +++ b/build/docker/templates/intel-idxd-config-initcontainer.Dockerfile.in @@ -1,5 +1,6 @@ FROM debian:unstable-slim +COPY ./LICENSE /licenses/intel-device-plugins-for-kubernetes/LICENSE RUN apt-get update && apt-get install -y --no-install-recommends accel-config jq && rm -rf /var/lib/apt/lists/\* COPY demo/idxd-init.sh /usr/local/bin/ diff --git a/build/docker/templates/intel-qat-initcontainer.Dockerfile.in b/build/docker/templates/intel-qat-initcontainer.Dockerfile.in index fd6ba36c..f2d27e5a 100644 --- a/build/docker/templates/intel-qat-initcontainer.Dockerfile.in +++ b/build/docker/templates/intel-qat-initcontainer.Dockerfile.in @@ -7,6 +7,7 @@ ARG DIR=/intel-device-plugins-for-kubernetes WORKDIR $DIR COPY . . +RUN install -D ${DIR}/LICENSE /install_root/licenses/intel-device-plugins-for-kubernetes/LICENSE #include "toybox_build.docker" FROM ${FINAL_BASE}