diff options
| author | Adin Scannell <ascannell@google.com> | 2020-12-09 09:31:44 -0800 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2020-12-09 15:53:23 -0800 |
| commit | a855a814d601a4c30f26743ef1bf016df956e042 (patch) | |
| tree | b017a831f6eff9c9734663114bbdf39fc4b6ffc7 /tools/installers | |
| parent | f6cb96bd57dec4e3baa8c57ccdeb0f1d8706b682 (diff) | |
Refactor the Makefile to avoid recursive Make.
Recursive make is difficult to follow and debug. Drop this by using
internal functions, which, while difficult, are easier than trying to
following recursive invokations.
Further simplify the Makefile by collapsing the image bits and removing
the tools/vm directory, which is effectively unused.
Fixes #4952
PiperOrigin-RevId: 346569133
Diffstat (limited to 'tools/installers')
| -rw-r--r-- | tools/installers/BUILD | 10 | ||||
| -rwxr-xr-x | tools/installers/containerd.sh | 2 |
2 files changed, 2 insertions, 10 deletions
diff --git a/tools/installers/BUILD b/tools/installers/BUILD index 13d3cc5e0..bbf3c1f85 100644 --- a/tools/installers/BUILD +++ b/tools/installers/BUILD @@ -1,4 +1,4 @@ -# Installers for use by the tools/vm_test rules. +# Installers for use by top-level scripts. package( default_visibility = ["//:sandbox"], @@ -14,14 +14,6 @@ sh_binary( ) sh_binary( - name = "images", - srcs = ["images.sh"], - data = [ - "//images", - ], -) - -sh_binary( name = "master", srcs = ["master.sh"], ) diff --git a/tools/installers/containerd.sh b/tools/installers/containerd.sh index 5520a447c..d28549734 100755 --- a/tools/installers/containerd.sh +++ b/tools/installers/containerd.sh @@ -16,7 +16,7 @@ set -xeo pipefail -declare -r CONTAINERD_VERSION=${CONTAINERD_VERSION:-1.3.0} +declare -r CONTAINERD_VERSION=${1:-1.3.0} declare -r CONTAINERD_MAJOR="$(echo ${CONTAINERD_VERSION} | awk -F '.' '{ print $1; }')" declare -r CONTAINERD_MINOR="$(echo ${CONTAINERD_VERSION} | awk -F '.' '{ print $2; }')" |