349d2b5c15
runc v1.1.13 introduced an option to customize the version (as printed by the
`--version` flag) through a `VERSION` Make variable / environment variable
(see [1]).
This variable collided with the `VERSION` environment variable used by
containerd for the same purpose, which lead to `runc` binaries built
using the version of containerd;
runc --version
runc version 1.7.20
commit: v1.1.13-0-g58aa9203
...
This patch unsets the `VERSION` variable to bring prevent it from being
inherited and to bring back the previous behavior.
Before this patch:
docker build -t containerd-test -f contrib/Dockerfile.test .
docker run -it --rm --env VERSION=1.7.20 containerd-test sh -c 'script/setup/install-runc && /usr/local/sbin/runc --version'
# ....
HEAD is now at 58aa9203 VERSION: release 1.1.13
go build -trimpath "-buildmode=pie" -tags "seccomp" -ldflags "-X main.gitCommit=v1.1.13-0-g58aa9203 -X main.version=1.7.20 " -o runc .
install -D -m0755 runc /usr/local/sbin/runc
/go/src/github.com/containerd/containerd
runc version 1.7.20
commit: v1.1.13-0-g58aa9203
spec: 1.0.2-dev
go: go1.22.5
libseccomp: 2.5.4
With this patch:
docker build -t containerd-test -f contrib/Dockerfile.test .
docker run -it --rm --env VERSION=1.7.20 containerd-test sh -c 'script/setup/install-runc && /usr/local/sbin/runc --version'
# ....
HEAD is now at 58aa9203 VERSION: release 1.1.13
go build -trimpath "-buildmode=pie" -tags "seccomp" -ldflags "-X main.gitCommit=v1.1.13-0-g58aa9203 -X main.version=v1.1.13 " -o runc .
install -D -m0755 runc /usr/local/sbin/runc
/go/src/github.com/containerd/containerd
runc version v1.1.13
commit: v1.1.13-0-g58aa9203
spec: 1.0.2-dev
go: go1.22.5
libseccomp: 2.5.4
[1]: 6f4d975c40
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
62 lines
1.8 KiB
Bash
Executable File
62 lines
1.8 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
# Copyright The containerd Authors.
|
|
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
#
|
|
# Builds and installs runc to /usr/local/go/bin based off
|
|
# the commit defined in go.mod
|
|
#
|
|
set -eu -o pipefail
|
|
|
|
script_dir="$(cd -- "$(dirname -- "$0")" > /dev/null 2>&1; pwd -P)"
|
|
|
|
# e2e and Cirrus will fail with "sudo: command not found"
|
|
SUDO=''
|
|
if (( $EUID != 0 )); then
|
|
SUDO='sudo'
|
|
fi
|
|
|
|
function install_runc() {
|
|
# When updating runc-version, consider updating the runc module in go.mod as well
|
|
: "${RUNC_VERSION:=$(cat "${script_dir}/runc-version")}"
|
|
: "${RUNC_REPO:=https://github.com/opencontainers/runc.git}"
|
|
|
|
TMPROOT=$(mktemp -d)
|
|
git clone "${RUNC_REPO}" "${TMPROOT}"/runc
|
|
pushd "${TMPROOT}"/runc
|
|
git checkout "${RUNC_VERSION}"
|
|
env -u VERSION make BUILDTAGS='seccomp' runc
|
|
$SUDO make install
|
|
popd
|
|
rm -fR "${TMPROOT}"
|
|
}
|
|
|
|
function install_crun() {
|
|
: "${CRUN_VERSION:=$(cat "${script_dir}/crun-version")}"
|
|
: "${CRUN_REPO:=https://github.com/containers/crun}"
|
|
$SUDO curl -S -o /usr/local/sbin/runc -L "${CRUN_REPO}"/releases/download/"${CRUN_VERSION}"/crun-"${CRUN_VERSION}"-linux-"$(go env GOARCH)"
|
|
$SUDO chmod +x /usr/local/sbin/runc
|
|
}
|
|
|
|
: "${RUNC_FLAVOR:=runc}"
|
|
case ${RUNC_FLAVOR} in
|
|
runc) install_runc ;;
|
|
crun) install_crun ;;
|
|
*)
|
|
echo >&2 "unknown runc flavor: ${RUNC_FLAVOR}"
|
|
exit 1
|
|
;;
|
|
esac
|