diff --git a/Dockerfile b/Dockerfile index ab28f6185f..0ea6d8f2fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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=v1.1.1 +ARG ROOTLESSKIT_VERSION=v2.0.0 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 e6823774cd..00807ca84e 100755 --- a/hack/dockerfile/install/rootlesskit.installer +++ b/hack/dockerfile/install/rootlesskit.installer @@ -1,7 +1,7 @@ #!/bin/sh # When updating, also update vendor.mod and Dockerfile accordingly. -: "${ROOTLESSKIT_VERSION:=v1.1.1}" +: "${ROOTLESSKIT_VERSION:=v2.0.0}" install_rootlesskit() { case "$1" in @@ -28,6 +28,6 @@ install_rootlesskit_dynamic() { _install_rootlesskit() ( echo "Install rootlesskit version ${ROOTLESSKIT_VERSION}" for f in rootlesskit rootlesskit-docker-proxy; do - GOBIN="${PREFIX}" GO111MODULE=on go install ${BUILD_MODE} -ldflags="$ROOTLESSKIT_LDFLAGS" "github.com/rootless-containers/rootlesskit/cmd/${f}@${ROOTLESSKIT_VERSION}" + GOBIN="${PREFIX}" GO111MODULE=on go install ${BUILD_MODE} -ldflags="$ROOTLESSKIT_LDFLAGS" "github.com/rootless-containers/rootlesskit/v2/cmd/${f}@${ROOTLESSKIT_VERSION}" done )