From 4f01f294bb3ccc2792ca7d47b516a0734cb5ed25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 12 Dec 2023 11:43:12 +0100 Subject: [PATCH] kata-deploy: Install `tomlq` to the base image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will help us to have an easier time playing with the containerd configuration, instead of having to sed the **** out of it, which is super error prone. `tomlq` is a tool that comes from https://github.com/kislyuk/yq, and that depends on `jq` to do the toml parsing / editing. Signed-off-by: Fabiano Fidêncio --- tools/packaging/kata-deploy/Dockerfile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/packaging/kata-deploy/Dockerfile b/tools/packaging/kata-deploy/Dockerfile index 95f07f143..8bcd0f298 100644 --- a/tools/packaging/kata-deploy/Dockerfile +++ b/tools/packaging/kata-deploy/Dockerfile @@ -10,6 +10,14 @@ ARG DESTINATION=/opt/kata-artifacts COPY ${KATA_ARTIFACTS} ${WORKDIR} +# I understand that in order to be on the safer side, it'd +# be good to have the alpine packages pointing to a very +# specific version, but this may break anyone else trying +# to use a different version of alpine for one reason or +# another. With this in mind, let's ignore DL3018. +# SC2086 is about using double quotes to prevent globbing and +# word splitting, which can also be ignored for now. +# hadolint ignore=DL3018,SC2086 RUN \ apk --no-cache add bash curl && \ ARCH=$(uname -m) && \ @@ -20,7 +28,9 @@ RUN \ mkdir -p ${DESTINATION} && \ tar xvf ${WORKDIR}/${KATA_ARTIFACTS} -C ${DESTINATION} && \ rm -f ${WORKDIR}/${KATA_ARTIFACTS} && \ - apk del curl + apk del curl && \ + apk --no-cache add jq py3-pip && \ + pip install --no-cache-dir yq==3.2.3 COPY scripts ${DESTINATION}/scripts COPY runtimeclasses ${DESTINATION}/runtimeclasses