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

Dockerfile: update rootlesskit to v1.1.1, and use tags as reference

Browse source 
Commit 0b1c1877c5 updated the version in
hack/dockerfile/install/rootlesskit.installer, but forgot to update the
version in Dockerfile.

Also updating both to use a tag, instead of commit. While it's good to pin by
an immutable reference, I think it's reasonably safe to use the tag, which is
easier to use, and what we do for other binaries, such as runc as well.

Full diff: https://github.com/rootless-containers/rootlesskit/compare/v1.1.0...v1.1.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2024-01-09 09:54:47 +01:00
parent c41f94eda3
commit e27ffdab0f
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
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

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

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

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