mirror of
https://github.com/moby/moby.git
synced 2026-01-11 18:51:37 +00:00
Merge pull request #50647 from thaJeztah/rm_vendor.mod
remove references to "vendor.mod"
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
|
||||
buildkit_pkg=github.com/moby/buildkit
|
||||
|
||||
# get buildkit version from vendor.mod
|
||||
# get buildkit version from go.mod
|
||||
buildkit_ref=$(go list -mod=mod -u -m -f '{{if .Replace}}{{.Replace.Version}}{{else}}{{.Version}}{{end}}' "$buildkit_pkg")
|
||||
buildkit_repo=$(go list -mod=mod -u -m -f '{{if .Replace}}{{.Replace.Path}}{{else}}{{.Path}}{{end}}' "$buildkit_pkg")
|
||||
buildkit_repo=${buildkit_repo#github.com/}
|
||||
|
||||
@@ -10,11 +10,6 @@ set -e
|
||||
# as is specified here.
|
||||
#
|
||||
# Generally, the commit specified here should match a tagged release.
|
||||
#
|
||||
# The containerd golang package is also pinned in vendor.mod. When updating
|
||||
# the binary version you may also need to update the vendor version to pick up
|
||||
# bug fixes or new APIs, however, usually the Go packages are built from a
|
||||
# commit from the master branch.
|
||||
: "${CONTAINERD_VERSION:=v1.7.28}"
|
||||
|
||||
install_containerd() (
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
# When updating, also update vendor.mod and Dockerfile accordingly.
|
||||
# When updating, also update go.mod and Dockerfile accordingly.
|
||||
: "${ROOTLESSKIT_VERSION:=v2.3.4}"
|
||||
|
||||
install_rootlesskit() {
|
||||
|
||||
@@ -7,8 +7,6 @@ set -e
|
||||
# The version of runc should match the version that is used by the containerd
|
||||
# version that is used. If you need to update runc, open a pull request in
|
||||
# the containerd project first, and update both after that is merged.
|
||||
#
|
||||
# When updating RUNC_VERSION, consider updating runc in vendor.mod accordingly
|
||||
: "${RUNC_VERSION:=v1.3.0}"
|
||||
|
||||
install_runc() {
|
||||
|
||||
@@ -5,7 +5,7 @@ set -e
|
||||
SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
source "${SCRIPTDIR}/.validate"
|
||||
|
||||
tidy_files=('vendor.mod' 'vendor.sum')
|
||||
tidy_files=('go.mod' 'go.sum')
|
||||
vendor_files=("${tidy_files[@]}" 'vendor/')
|
||||
|
||||
validate_vendor_tidy() {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/usr/bin/env bash
|
||||
#
|
||||
# This file is just a wrapper around the 'go mod vendor' tool.
|
||||
# For updating dependencies you should change `vendor.mod` file in root of the
|
||||
# For updating dependencies you should change `go.mod` file in root of the
|
||||
# project.
|
||||
|
||||
set -e
|
||||
|
||||
Reference in New Issue
Block a user