diff --git a/Dockerfile b/Dockerfile index 7311213f55..81edbb54f1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -351,8 +351,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 diff --git a/hack/dockerfile/install/rootlesskit.installer b/hack/dockerfile/install/rootlesskit.installer index 37090936da..e6823774cd 100755 --- a/hack/dockerfile/install/rootlesskit.installer +++ b/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