github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

script/setup: use git clone instead of go get -d

Browse Source 
`go get -d` uses go modules by default in Go 1.16 and up, which results
in modules being fetched for the "latest" module version, after which we
tried to "git checkout" to `<VERSION>`.

For runc, this means that (possibly incorrectly), `go get` will download
runc `v0.1.1` (most recent non-"pre-release", which caused failures (e.g
the old `Sirupsen/logrus` being downloaded).

In addition, some of the dependencies we're installing use vendoring, and
thus would not require the modules to be downloaded (and vendored files
will be ignored when using `go get` with modules).

This patch switches several uses `go get -d` to use a regular
git clone, after which the desired version is checked out,
and the binaries are built.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Phil Estes <estesp@amazon.com>
This commit is contained in:
Sebastiaan van Stijn 2021-02-05 13:50:07 +01:00 committed by Phil Estes
parent 5f2d02adc5
commit 164573897c
No known key found for this signature in database
GPG Key ID: FE2598126B196A38
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
script/setup/install-cni
View File

@ -25,8 +25,7 @@ CNI_COMMIT=$(grep containernetworking/plugins "$GOPATH"/src/github.com/container
CNI_DIR=${DESTDIR:=''}/opt/cni CNI_DIR=${DESTDIR:=''}/opt/cni
CNI_CONFIG_DIR=${DESTDIR}/etc/cni/net.d CNI_CONFIG_DIR=${DESTDIR}/etc/cni/net.d
cd "$GOPATH" git clone https://github.com/containernetworking/plugins.git "$GOPATH"/src/github.com/containernetworking/plugins
go get -d github.com/containernetworking/plugins/...
cd "$GOPATH"/src/github.com/containernetworking/plugins cd "$GOPATH"/src/github.com/containernetworking/plugins
git checkout $CNI_COMMIT git checkout $CNI_COMMIT
./build_linux.sh ./build_linux.sh

3
script/setup/install-cni-windows
View File

@ -21,8 +21,7 @@ WINCNI_BIN_DIR="${DESTDIR}/cni"
WINCNI_PKG=github.com/Microsoft/windows-container-networking WINCNI_PKG=github.com/Microsoft/windows-container-networking
WINCNI_VERSION=aa10a0b31e9f72937063436454def1760b858ee2 WINCNI_VERSION=aa10a0b31e9f72937063436454def1760b858ee2
cd "$GOPATH" git clone "https://${WINCNI_PKG}.git" "${GOPATH}/src/${WINCNI_PKG}"
go get -d "${WINCNI_PKG}/..."
cd "${GOPATH}/src/${WINCNI_PKG}" cd "${GOPATH}/src/${WINCNI_PKG}"
git checkout "${WINCNI_VERSION}" git checkout "${WINCNI_VERSION}"
make all make all

5
script/setup/install-critools
View File

@ -23,9 +23,10 @@ set -eu -o pipefail
cd "$GOPATH" cd "$GOPATH"
go get -u github.com/onsi/ginkgo/ginkgo go get -u github.com/onsi/ginkgo/ginkgo
CRITEST_COMMIT=0f5f734a7e1da0979915c6e7d5b6641bd9dc2627 CRITEST_COMMIT=0f5f734a7e1da0979915c6e7d5b6641bd9dc2627
go get -d github.com/kubernetes-sigs/cri-tools/...
git clone https://github.com/kubernetes-sigs/cri-tools.git "$GOPATH"/src/github.com/kubernetes-sigs/cri-tools
cd "$GOPATH"/src/github.com/kubernetes-sigs/cri-tools cd "$GOPATH"/src/github.com/kubernetes-sigs/cri-tools
git checkout $CRITEST_COMMIT git checkout "$CRITEST_COMMIT"
make make
make install -e BINDIR=${DESTDIR:=''}/usr/local/bin make install -e BINDIR=${DESTDIR:=''}/usr/local/bin
cat << EOF | tee ${DESTDIR}/etc/crictl.yaml cat << EOF | tee ${DESTDIR}/etc/crictl.yaml

14
script/setup/install-runc
View File

@ -23,21 +23,23 @@ set -eu -o pipefail
function install_runc() { function install_runc() {
RUNC_COMMIT=$(grep opencontainers/runc "$GOPATH"/src/github.com/containerd/containerd/go.mod | awk '{print $2}') RUNC_COMMIT=$(grep opencontainers/runc "$GOPATH"/src/github.com/containerd/containerd/go.mod | awk '{print $2}')
cd "$GOPATH" TMPROOT=$(mktemp -d)
go get -d github.com/opencontainers/runc git clone https://github.com/opencontainers/runc.git "${TMPROOT}"/runc
cd "$GOPATH"/src/github.com/opencontainers/runc pushd "${TMPROOT}"/runc
git checkout $RUNC_COMMIT git checkout "${RUNC_COMMIT}"
make BUILDTAGS='apparmor seccomp selinux' runc make BUILDTAGS='apparmor seccomp selinux' runc
make install make install
popd
rm -fR "${TMPROOT}"
} }
function install_crun() { function install_crun() {
CRUN_VERSION=0.17 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) 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 chmod +x /usr/local/sbin/runc
} }
: ${RUNC_FLAVOR:=runc} : "${RUNC_FLAVOR:=runc}"
case ${RUNC_FLAVOR} in case ${RUNC_FLAVOR} in
runc) install_runc ;; runc) install_runc ;;
crun) install_crun ;; crun) install_crun ;;