Skip to content

Commit

Permalink
Merge pull request #47334 from thaJeztah/25.0_backport_rootlesskit_bi…
Browse files Browse the repository at this point in the history
…nary_2.0.1

[25.0 backport] Dockerfile: update RootlessKit to v2.0.1
  • Loading branch information
thaJeztah committed Feb 6, 2024
2 parents ab29279 + 1652559 commit df96d8d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ 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 vendor.mod and hack/dockerfile/install/rootlesskit.installer accordingly.
ARG ROOTLESSKIT_VERSION=v2.0.0
ARG ROOTLESSKIT_VERSION=v2.0.1
RUN git fetch -q --depth 1 origin "${ROOTLESSKIT_VERSION}" +refs/tags/*:refs/tags/* && git checkout -q FETCH_HEAD

FROM base AS rootlesskit-build
Expand Down
2 changes: 1 addition & 1 deletion hack/dockerfile/install/rootlesskit.installer
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

# When updating, also update vendor.mod and Dockerfile accordingly.
: "${ROOTLESSKIT_VERSION:=v2.0.0}"
: "${ROOTLESSKIT_VERSION:=v2.0.1}"

install_rootlesskit() {
case "$1" in
Expand Down

0 comments on commit df96d8d

Please sign in to comment.