From a855a814d601a4c30f26743ef1bf016df956e042 Mon Sep 17 00:00:00 2001 From: Adin Scannell Date: Wed, 9 Dec 2020 09:31:44 -0800 Subject: 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 --- tools/installers/containerd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/installers/containerd.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; }')" -- cgit v1.2.3