Просмотр исходного кода

Merge pull request #47047 from thaJeztah/24.0_backport_bump_rootlesskit

[24.0 backport] Dockerfile: update rootlesskit to v1.1.1, and use tags as reference
Sebastiaan van Stijn 1 год назад
Родитель
Сommit
854ca341c0
2 измененных файлов с 4 добавлено и 5 удалено
  1. 2 2
      Dockerfile
  2. 2 3
      hack/dockerfile/install/rootlesskit.installer

+ 2 - 2
Dockerfile

@@ -344,8 +344,8 @@ FROM tini-${TARGETOS} AS tini
 FROM base AS rootlesskit-src
 WORKDIR /usr/src/rootlesskit
 RUN git init . && git remote add origin "https://github.com/rootless-containers/rootlesskit.git"
-# When updating, also update rootlesskit commit in vendor.mod accordingly.
-ARG ROOTLESSKIT_VERSION=v1.1.0
+# When updating, also update vendor.mod and hack/dockerfile/install/rootlesskit.installer accordingly.
+ARG ROOTLESSKIT_VERSION=v1.1.1
 RUN git fetch -q --depth 1 origin "${ROOTLESSKIT_VERSION}" +refs/tags/*:refs/tags/* && git checkout -q FETCH_HEAD
 
 FROM base AS rootlesskit-build

+ 2 - 3
hack/dockerfile/install/rootlesskit.installer

@@ -1,8 +1,7 @@
 #!/bin/sh
 
-# When updating, also update rootlesskit commit in vendor.mod accordingly
-# v1.1.1
-: "${ROOTLESSKIT_VERSION:=a2c596ff9b3fddc0c2becb38f2ef4004f15765b5}"
+# When updating, also update vendor.mod and Dockerfile accordingly.
+: "${ROOTLESSKIT_VERSION:=v1.1.1}"
 
 install_rootlesskit() {
 	case "$1" in