0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #47047 from thaJeztah/24.0_backport_bump_rootlesskit

Browse source 
[24.0 backport] Dockerfile: update rootlesskit to v1.1.1, and use tags as reference
This commit is contained in:
Sebastiaan van Stijn 2024-01-09 13:28:56 +01:00 • committed by GitHub
commit 854ca341c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile
View file

@ -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

5
hack/dockerfile/install/rootlesskit.installer
View file

@ -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