chore: bump deps

| Package | Update | Change | |---|---|---| | [https://github.com/qemu/qemu.git](https://togithub.com/qemu/qemu) | minor | `8.0.2` -> `v8.1.0` | | [https://gitlab.com/nvidia/container-toolkit/container-toolkit.git](https://gitlab.com/nvidia/container-toolkit/container-toolkit) | minor | `v1.13.5` -> `v1.14.0` | | [https://gitlab.com/nvidia/container-toolkit/libnvidia-container.git](https://gitlab.com/nvidia/container-toolkit/libnvidia-container) | minor | `v1.13.5` -> `v1.14.0` | | [https://gitlab.gnome.org/GNOME/glib.git](https://gitlab.gnome.org/GNOME/glib) | minor | `2.76.3` -> `2.77.3` | | [siderolabs/bldr](https://togithub.com/siderolabs/bldr) | patch | `v0.2.0` -> `v0.2.1` | | [tailscale/tailscale](https://togithub.com/tailscale/tailscale) | minor | `1.46.1` -> `1.48.1` | Also fix the wolfi-base variable to get renovate updates. Signed-off-by: Noel Georgi <git@frezbo.dev>
siderolabs · Sep 4, 2023 · d9145f9 · d9145f9
1 parent 0cba1b6
commit d9145f9
Show file tree

Hide file tree

Showing 18 changed files with 37 additions and 34 deletions.
diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@ GOARCH := amd64
 endif
 
 # keep in sync with Pkgfile
-BLDR_RELEASE ?= v0.2.0
+BLDR_RELEASE ?= v0.2.1
 PKGS ?= v1.6.0-alpha.0-10-gd3d7d29
 
 BUILD := docker buildx build

diff --git a/Pkgfile b/Pkgfile
@@ -1,11 +1,11 @@
-# syntax = ghcr.io/siderolabs/bldr:v0.2.0
+# syntax = ghcr.io/siderolabs/bldr:v0.2.1
 
 format: v1alpha2
 
 vars:
   PKGS_PREFIX: ghcr.io/siderolabs
   LINUX_FIRMWARE_VERSION: "20230804" # update this when updating PKGS_VERSION in Makefile
-  DRBD_DRIVER_VERSION: 9.2.4 # update this when updating PKGS_VERSION in Makefile
+  DRBD_DRIVER_VERSION: 9.2.5 # update this when updating PKGS_VERSION in Makefile
   ZFS_DRIVER_VERSION: 2.1.12 # update this when updating PKGS_VERSION in Makefile
   UTIL_LINUX_VERSION: 2.39.2 # update this when updating PKGS_VERSION in Makefile
 

diff --git a/hack/release.toml b/hack/release.toml
@@ -49,6 +49,10 @@ ZFS extensions now also ship zfs-tools and an extension service that imports all
         title = "Component Updates"
         description = """\
 * DRBD: 9.2.5
+* nvidia-container-toolkit: v1.14.0
+* libnvidia-container: v1.14.0
+* QEMU agent: v8.1.0
+* Tailscale: 1.48.1
 """
 
 

diff --git a/network/tailscale/pkg.yaml b/network/tailscale/pkg.yaml
@@ -9,8 +9,8 @@ steps:
   - sources:
       - url: https://github.com/tailscale/tailscale/archive/refs/tags/v{{ .TAILSCALE_VERSION }}.tar.gz
         destination: tailscale.tar.gz
-        sha256: a567bafec720869faa25eb1886dac1b519679c8dbe5762d1e9cdb653898df076
-        sha512: cecaa216b1f451b65e826856f630e5dd8ef9bbd85684602450e71f0f46b6b1b97bf20a0b7c401a72c354a5a9404386d6bd03350da2a65fb4e358320763d93ab4
+        sha256: 6b3152cdd9ed915c01ce30f3967c0d4e04e2a81053eddeb93792d93088fe2d72
+        sha512: a94ec8aa0f0e7ab40d53c3477af0155765e61cb5ea9498aa8105b55918c5e5364665712c50a6d8955bee180bbffee4ce40d7a80c13277e3d904769d0db7e660b
     prepare:
       - |
         sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml

diff --git a/network/vars.yaml b/network/vars.yaml
@@ -1,2 +1,2 @@
 # renovate: datasource=github-releases extractVersion=^v(?<version>.*)$ depName=tailscale/tailscale
-TAILSCALE_VERSION: 1.46.1
+TAILSCALE_VERSION: 1.48.1
diff --git a/nvidia-gpu/nvidia-container-toolkit/glibc/pkg.yaml b/nvidia-gpu/nvidia-container-toolkit/glibc/pkg.yaml
@@ -8,7 +8,7 @@ install:
   - bison
   - python3
 dependencies:
-  - image: cgr.dev/chainguard/wolfi-base:{{ .WOLFI_BASE_VERSION }}
+  - image: cgr.dev/chainguard/wolfi-base@{{ .WOLFI_BASE_REF }}
 steps:
   - sources:
       - url: https://ftpmirror.gnu.org/libc/glibc-{{ .GLIBC_VERSION }}.tar.gz

diff --git a/nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/elfutils/pkg.yaml b/nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/elfutils/pkg.yaml
@@ -6,7 +6,7 @@ install:
   - bash
   - m4
 dependencies:
-  - image: cgr.dev/chainguard/wolfi-base:{{ .WOLFI_BASE_VERSION }}
+  - image: cgr.dev/chainguard/wolfi-base@{{ .WOLFI_BASE_REF }}
   - stage: zlib
     from: /rootfs
 steps:

diff --git a/nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/libcap2/pkg.yaml b/nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/libcap2/pkg.yaml
@@ -5,7 +5,7 @@ install:
   - build-base
   - bash
 dependencies:
-  - image: cgr.dev/chainguard/wolfi-base:{{ .WOLFI_BASE_VERSION }}
+  - image: cgr.dev/chainguard/wolfi-base@{{ .WOLFI_BASE_REF }}
 steps:
   - sources:
       - url: https://kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-{{ .LIBCAP_VERSION }}.tar.xz

diff --git a/nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/libseccomp/pkg.yaml b/nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/libseccomp/pkg.yaml
@@ -6,7 +6,7 @@ install:
   - bash
   - gperf
 dependencies:
-  - image: cgr.dev/chainguard/wolfi-base:{{ .WOLFI_BASE_VERSION }}
+  - image: cgr.dev/chainguard/wolfi-base@{{ .WOLFI_BASE_REF }}
 steps:
   - sources:
       - url: https://github.com/seccomp/libseccomp/releases/download/v{{ .LIBSECCOMP_VERSION }}/libseccomp-{{ .LIBSECCOMP_VERSION }}.tar.gz

diff --git a/nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/libtirpc/pkg.yaml b/nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/libtirpc/pkg.yaml
@@ -7,7 +7,7 @@ install:
   - bash
   - autoconf
 dependencies:
-  - image: cgr.dev/chainguard/wolfi-base:{{ .WOLFI_BASE_VERSION }}
+  - image: cgr.dev/chainguard/wolfi-base@{{ .WOLFI_BASE_REF }}
 steps:
   - sources:
       - url: https://src.fedoraproject.org/lookaside/extras/libtirpc/libtirpc-{{ .LIBTIRPC_VERSION | replace "-" "." }}.tar.bz2/sha512/df0781a74ff9ded2d3c4f5eb7e05496b9f58eac8060c02c68331dc14c4a00304dcd19f46836f5756fe0d9d27095fd463d42dd696fcdff891516711b7d63deabe/libtirpc-{{ .LIBTIRPC_VERSION | replace "-" "." }}.tar.bz2

diff --git a/nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/pkg.yaml b/nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/pkg.yaml
@@ -6,12 +6,11 @@ install:
   - bash
   - go
   - coreutils
-  - sed
   - curl
   - rpcsvc-proto
   - patch
 dependencies:
-  - image: cgr.dev/chainguard/wolfi-base:{{ .WOLFI_BASE_VERSION }}
+  - image: cgr.dev/chainguard/wolfi-base@{{ .WOLFI_BASE_REF }}
   # nvidia-pkgs depends on glibc,
   # so any stage depending on nvidia-container-cli will have the updated ld.so.cache,
   # from both nvidia-pkgs and nvidia-container-cli
@@ -30,16 +29,16 @@ steps:
   - sources:
       - url: https://gitlab.com/nvidia/container-toolkit/libnvidia-container/-/archive/{{ .LIBNVIDIA_CONTAINER_VERSION }}/libnvidia-container-{{ .LIBNVIDIA_CONTAINER_VERSION }}.tar.gz
         destination: libnvidia-container.tar.gz
-        sha256: 4beebedd045468e8174895f5d4a563f7880cf7a10f062d996719c061fcdaa0db
-        sha512: a16f163cb8689f4b6279bed1a5965ee4c56f413918cae6acf272ca5adf7dd929818d977dd6657ce496abeb842b56e03bfd83bda828a7b953625b2999ac174b93
+        sha256: e9cff43bbbe5d6b0e394713f7711b1ec7b0c2878c827f140ee350e44de4d1f4b
+        sha512: 79d55974b85f9596253f60821319f94652de1fc8f0a21f23ada65905e4b2547b3f594273c77b6d57a37a3c2b11ff0ca84f6efb4311c7be3b4b2066d53181e39c
     env:
       REVISION: {{ .LIBNVIDIA_CONTAINER_REF }}
+      GIT_TAG: {{ .LIBNVIDIA_CONTAINER_VERSION | replace "v" "" }}
       WITH_NVCGO: yes
       WITH_LIBELF: yes
       WITH_TIRPC: no # setting no means we'll use the system libtirpc
       WITH_SECCOMP: yes
       PKG_CONFIG_PATH: /usr/local/lib/pkgconfig # to find runtime libraries compiled in extensions (libseccomp)
-      PATH: "/usr/bin:{{ .PATH }}" # bldr doesn't have /usr/bin in PATH
     prepare:
       - |
         mkdir libnvidia-container

diff --git a/nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/zlib/pkg.yaml b/nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/zlib/pkg.yaml
@@ -5,7 +5,7 @@ install:
   - build-base
   - bash
 dependencies:
-  - image: cgr.dev/chainguard/wolfi-base:{{ .WOLFI_BASE_VERSION }}
+  - image: cgr.dev/chainguard/wolfi-base@{{ .WOLFI_BASE_REF }}
 steps:
   - sources:
       - url: https://zlib.net/fossils/zlib-{{ .ZLIB_VERSION }}.tar.gz

diff --git a/nvidia-gpu/nvidia-container-toolkit/nvidia-container-runtime/pkg.yaml b/nvidia-gpu/nvidia-container-toolkit/nvidia-container-runtime/pkg.yaml
@@ -7,13 +7,13 @@ install:
   - go
   - patch
 dependencies:
-  - image: cgr.dev/chainguard/wolfi-base:{{ .WOLFI_BASE_VERSION }}
+  - image: cgr.dev/chainguard/wolfi-base@{{ .WOLFI_BASE_REF }}
 steps:
   - sources:
       - url: https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/archive/{{ .CONTAINER_TOOLKIT_VERSION }}/container-toolkit-{{ .CONTAINER_TOOLKIT_VERSION }}.tar.gz
         destination: container-toolkit.tar.gz
-        sha256: b9ee6f96addbcbace9503f29551b4f3c42d76293a0d54f5c6009971909dac0fc
-        sha512: 69bfac15d8be2797b09dda35650a90dcb2c24ca7a5107c3df5946840a55df8dc62cb5cc46f172169ee3e8447c416733848b513b92dc512df35e0aad7c77e5c1e
+        sha256: 523d6341ad808f2513b20918175245be1c342f8a5ff187777c6e26e4197da17e
+        sha512: 39774643b3e9489f216649515cd9058d6de7e9d57019437e2c286802710e59d207becfcdb16489456c3043d057a0fb841e86810006e5cf283628b06e2863cee8
     env:
       GIT_COMMIT: {{ substr 0 7 .CONTAINER_TOOLKIT_REF }} # build is using short sha
     prepare:

diff --git a/nvidia-gpu/nvidia-container-toolkit/nvidia-pkgs/pkg.yaml b/nvidia-gpu/nvidia-container-toolkit/nvidia-pkgs/pkg.yaml
@@ -4,7 +4,7 @@ shell: /bin/bash
 install:
   - bash
 dependencies:
-  - image: cgr.dev/chainguard/wolfi-base:{{ .WOLFI_BASE_VERSION }}
+  - image: cgr.dev/chainguard/wolfi-base@{{ .WOLFI_BASE_REF }}
   # depends on glibc to update ld.so.cache
   # so any stage depending on nvidia-pkgs will have the updated cache
   - stage: glibc

diff --git a/nvidia-gpu/vars.yaml b/nvidia-gpu/vars.yaml
@@ -2,13 +2,13 @@
 # renovate: datasource=github-releases depName=nvidia/open-gpu-kernel-modules
 NVIDIA_DRIVER_VERSION: 535.54.03
 # renovate: datasource=git-tags depName=https://gitlab.com/nvidia/container-toolkit/container-toolkit.git
-CONTAINER_TOOLKIT_VERSION: v1.13.5
-CONTAINER_TOOLKIT_REF: 6b8589dcb4dead72ab64f14a5912886e6165c079
+CONTAINER_TOOLKIT_VERSION: v1.14.0
+CONTAINER_TOOLKIT_REF: f2bd3173d44938eadb73252b866a9b3a7f44b8c6
 # renovate: datasource=git-tags depName=https://gitlab.com/nvidia/container-toolkit/libnvidia-container.git
-LIBNVIDIA_CONTAINER_VERSION: v1.13.5
-LIBNVIDIA_CONTAINER_REF: 66607bd046341f7aad7de80a9f022f122d1f2fce
+LIBNVIDIA_CONTAINER_VERSION: v1.14.0
+LIBNVIDIA_CONTAINER_REF: 6a24508dff6cb36841114ff4c1287cd29ded72af
 # renovate: datasource=docker versioning=docker depName=cgr.dev/chainguard/wolfi-base
-WOLFI_BASE_VERSION: latest@sha256:255b803e19a867695128b838d54f115cbd0dfaa34d78a5119a4c23212814ae95 # latest-20230621 has a bug with buildng apps
+WOLFI_BASE_REF: sha256:f73a3360466ecc4d6df3f451d7d5c4c49663096e158848ddbc9603c52a47bffe
 # renovate: datasource=github-tags extractVersion=^go(?<version>.*)$ depName=golang/go
 GLIBC_VERSION: 2.38
 # renovate: datasource=github-tags extractVersion=^v(?<version>.*)$ depName=seccomp/libseccomp

diff --git a/qemu/qemu-guest-agent/glib/pkg.yaml b/qemu/qemu-guest-agent/glib/pkg.yaml
@@ -7,10 +7,10 @@ dependencies:
   - stage: pcre2
 steps:
   - sources:
-      - url: https://download.gnome.org/sources/glib/2.76/glib-{{ .GLIB_VERSION }}.tar.xz
+      - url: https://download.gnome.org/sources/glib/{{ regexReplaceAll ".\\d+$" .GLIB_VERSION "${1}" }}/glib-{{ .GLIB_VERSION }}.tar.xz
         destination: glib.tar.xz
-        sha256: c0be444e403d7c3184d1f394f89f0b644710b5e9331b54fa4e8b5037813ad32a
-        sha512: 291b8913918d411b679442b888f56893a857a77decfe428086c8bd1da1949498938ddb0bf254ed99d192e4a09b5e8cee1905fd6932ee642463fb229cac7c226e
+        sha256: 1753f963bb680b28a83d6e2095f63d0d4b94244675bcd2603850b2ebc1ac6a61
+        sha512: d9727d67e63d7f8ce710bff497c183799b0192ac10900da87887bd76812aad9603e7f132d7eb4e8626787c427048aeafb4a28654ab808c676bcfc2b897e005d9
     prepare:
       - |
         tar -xf glib.tar.xz --strip-components=1

diff --git a/qemu/qemu-guest-agent/pkg.yaml b/qemu/qemu-guest-agent/pkg.yaml
@@ -10,8 +10,8 @@ steps:
   - sources:
       - url: https://download.qemu.org/qemu-{{ .QEMU_VERSION }}.tar.xz
         destination: qemu.tar.xz
-        sha256: f060abd435fbe6794125e2c398568ffc3cfa540042596907a8b18edca34cf6a5
-        sha512: 4e915d33a662bf55b09247fb85150be376c92270d3764e3d6470c452cb70cc558f54e84de5610dd60a9eb3ea02d5d4277b1ec75c9804967d278fa8361c7f9b9a
+        sha256: 710c101198e334d4762eef65f649bc43fa8a5dd75303554b8acfec3eb25f0e55
+        sha512: c5f5e7ce2d8e3c93a02012b136c866e8577df07da4705a0045916c71caeaa21fa1b2d59a4b22a660789a4159b192e12a443e7cbb0724ee85fea258251731724c
     prepare:
       - |
         sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml

diff --git a/qemu/vars.yaml b/qemu/vars.yaml
@@ -1,6 +1,6 @@
-# renovate: datasource=git-tags depName=https://github.com/qemu/qemu.git
-QEMU_VERSION: 8.0.2
+# renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=https://github.com/qemu/qemu.git
+QEMU_VERSION: 8.1.0
 # renovate: datasource=git-tags depName=https://gitlab.gnome.org/GNOME/glib.git
-GLIB_VERSION: 2.76.3
+GLIB_VERSION: 2.77.3
 # renovate: datasource=github-releases extractVersion=^pcre2-(?<version>.*)$ depName=PCRE2Project/pcre2
 PCRE2_VERSION: 10.42