From 0d318d83f3463a9db0ad5f1a366e78f712a4d5e4 Mon Sep 17 00:00:00 2001 From: Itxaka Date: Fri, 2 Aug 2024 14:58:31 +0200 Subject: [PATCH 1/2] Add upstream luet and track it with renovate Signed-off-by: Itxaka --- Dockerfile | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3f690a9..48eb320 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,10 @@ ARG SECURITY_PROFILE=generic -FROM quay.io/kairos/packages:luet-utils-0.35.2 AS luet -FROM quay.io/kairos/packages-arm64:luet-utils-0.35.2 AS luet-arm64 +# renovate: datasource=docker depName=quay.io/luet/base versioning:semver +FROM quay.io/luet/base:0.35.4 AS luet -FROM alpine AS alpine-amd64 +FROM alpine AS base ENV LUET_NOLOCK=true COPY --from=luet /usr/bin/luet /usr/bin/luet - -FROM alpine AS alpine-arm64 -ENV LUET_NOLOCK=true -COPY --from=luet-arm64 /usr/bin/luet /usr/bin/luet - -# Common packages for all images -FROM alpine-${TARGETARCH} AS base COPY repositories.yaml /repositories.yaml RUN luet install -y --config repositories.yaml --system-target /framework \ dracut/kairos-network \ @@ -45,7 +38,6 @@ RUN luet cleanup --system-target /framework RUN rm -rf /framework/var/luet FROM scratch AS final -ARG TARGETARCH COPY repositories.yaml /etc/luet/luet.yaml COPY --from=post /framework / COPY --from=post /usr/bin/luet /usr/bin/luet From 65cb15185891bf89ed950d09d8f468c8f6119032 Mon Sep 17 00:00:00 2001 From: Itxaka Date: Fri, 2 Aug 2024 16:09:39 +0200 Subject: [PATCH 2/2] Bump repos as well Signed-off-by: Itxaka --- repositories.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repositories.yaml b/repositories.yaml index ce9e96f..020d772 100755 --- a/repositories.yaml +++ b/repositories.yaml @@ -10,10 +10,10 @@ repositories: urls: - "quay.io/kairos/packages" # renovate: datasource=docker depName=quay.io/kairos/packages - reference: 202408021047-git16b1d80d-repository.yaml + reference: 202408021333-git06a28240-repository.yaml - !!merge <<: *kairos arch: arm64 urls: - "quay.io/kairos/packages-arm64" # renovate: datasource=docker depName=quay.io/kairos/packages-arm64 - reference: 202408021107-git16b1d80d-repository.yaml + reference: 202408021346-git06a28240-repository.yaml