diff --git a/Dockerfile b/Dockerfile index 835761e..59bc9be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,8 +32,8 @@ ENV LUET_NOLOCK=true ENV TMPDIR=/tmp ARG TARGETARCH # copy both arches -COPY luet-arm64.yaml /tmp/luet-arm64.yaml -COPY luet-amd64.yaml /tmp/luet-amd64.yaml +COPY image-assets/luet-arm64.yaml /tmp/luet-arm64.yaml +COPY image-assets/luet-amd64.yaml /tmp/luet-amd64.yaml # Set the default luet config to the current build arch RUN mkdir -p /etc/luet/ RUN cp /tmp/luet-${TARGETARCH}.yaml /etc/luet/luet.yaml diff --git a/image-assets/luet-amd64.yaml b/image-assets/luet-amd64.yaml index 2ab555a..3e3f95b 100644 --- a/image-assets/luet-amd64.yaml +++ b/image-assets/luet-amd64.yaml @@ -13,4 +13,4 @@ repositories: urls: - "quay.io/kairos/packages" # renovate: datasource=docker depName=quay.io/kairos/packages - reference: 202411120825-git6d3d6215-repository.yaml + reference: 202412041137-gitd6a8038f-repository.yaml diff --git a/image-assets/luet-arm64.yaml b/image-assets/luet-arm64.yaml index a60210f..fda2d1d 100644 --- a/image-assets/luet-arm64.yaml +++ b/image-assets/luet-arm64.yaml @@ -13,4 +13,4 @@ repositories: urls: - "quay.io/kairos/packages-arm64" # renovate: datasource=docker depName=quay.io/kairos/packages-arm64 - reference: 202411120835-git6d3d6215-repository.yaml + reference: 202412041121-gitd6a8038f-repository.yaml diff --git a/luet-amd64.yaml b/luet-amd64.yaml deleted file mode 100644 index 9b232d4..0000000 --- a/luet-amd64.yaml +++ /dev/null @@ -1,16 +0,0 @@ -general: - debug: false - spinner_charset: 9 -logging: - enable_emoji: false -repositories: - - name: "kairos" - description: "kairos repository" - type: "docker" - cached: true - enable: true - priority: 2 - urls: - - "quay.io/kairos/packages" - # renovate: datasource=docker depName=quay.io/kairos/packages - reference: 202410161535-git06665921-repository.yaml diff --git a/luet-arm64.yaml b/luet-arm64.yaml deleted file mode 100644 index c157a08..0000000 --- a/luet-arm64.yaml +++ /dev/null @@ -1,16 +0,0 @@ -general: - debug: false - spinner_charset: 9 -logging: - enable_emoji: false -repositories: - - name: "kairos-arm64" - description: "kairos repository arm64" - type: "docker" - cached: true - enable: true - priority: 2 - urls: - - "quay.io/kairos/packages-arm64" - # renovate: datasource=docker depName=quay.io/kairos/packages-arm64 - reference: 202410161547-git06665921-repository.yaml diff --git a/renovate.json b/renovate.json index e2601fb..075de2d 100644 --- a/renovate.json +++ b/renovate.json @@ -19,6 +19,27 @@ "patch" ], "automerge": true + }, + { + "groupName": "repositories", + "matchPackageNames": [ + "/^quay.io/kairos/packages*/" + ] + }, + { + "versioning": "regex:^(?\\d{12})-git(?[a-f0-9]{8})-repository\\.yaml$", + "matchPackageNames": [ + "/^quay.io/kairos/packages*/" + ] + }, + { + "enabled": true, + "matchDatasources": [ + "docker" + ], + "matchUpdateTypes": [ + "major" + ] } ], "customManagers": [