 55a9bbc033
			
		
	
	55a9bbc033
	
	
	
		
			
			Both runc and containerd use BUILDTAGS to customize go build-tags.
When building containerd with custom build-tags, runc inherited
those, causing the default to be overwritten, e.g.;
    make BUILDTAGS=no_btrfs cri-cni-release
    (in script/setup/install-runc)
    HEAD is now at 12644e61 VERSION: release 1.0.0~rc93
    make[1]: Entering directory '/tmp/tmp.ZJzc2KtI0A/runc'
    go build -trimpath "-mod=vendor" "-buildmode=pie"  -tags "no_btrfs" -ldflags "-X main.gitCommit="12644e614e25b05da6fd08a38ffa0cfe1903fdec" -X main.version=1.0.0-rc93 " -o runc .
                                                   ^^^^^^^^^^^^^^^^
This patch brings back the BUILDTAGS make-var in the runc-install
script, which fixates the buildtags to our defaults.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
		
	
		
			
				
	
	
		
			54 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			54 lines
		
	
	
		
			1.6 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
 | |
| 
 | |
| function install_runc() {
 | |
| 	script_dir="$(cd -- "$(dirname -- "$0")" > /dev/null 2>&1; pwd -P)"
 | |
| 
 | |
| 	# When updating runc-version, consider updating the runc module in go.mod as well
 | |
| 	: "${RUNC_VERSION:=$(cat "${script_dir}/runc-version")}"
 | |
| 
 | |
| 	TMPROOT=$(mktemp -d)
 | |
| 	git clone https://github.com/opencontainers/runc.git "${TMPROOT}"/runc
 | |
| 	pushd "${TMPROOT}"/runc
 | |
| 	git checkout "${RUNC_VERSION}"
 | |
| 	make BUILDTAGS='seccomp' runc
 | |
| 	make install
 | |
| 	popd
 | |
| 	rm -fR "${TMPROOT}"
 | |
| }
 | |
| 
 | |
| function install_crun() {
 | |
| 	CRUN_VERSION=0.17
 | |
| 	curl -o /usr/local/sbin/runc -L https://github.com/containers/crun/releases/download/"${CRUN_VERSION}"/crun-"${CRUN_VERSION}"-linux-"$(go env GOARCH)"
 | |
| 	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
 |