From 290ae5f8432f81754dcdc5708ed1488e3986d79b Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Wed, 15 May 2024 11:06:47 +0100 Subject: [PATCH] pre-reqs: Remove duplicate of versions - To avoid having to update the versions in multiple places (which was missed last release), remove the default versions logic in payload.sh, as it is only called from the Makefile If a version is incorrectly set, then just rely on `set -o nounset` to warn the user about this Signed-off-by: stevenhorsman --- install/pre-install-payload/payload.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/install/pre-install-payload/payload.sh b/install/pre-install-payload/payload.sh index e9805aa2..9199172e 100755 --- a/install/pre-install-payload/payload.sh +++ b/install/pre-install-payload/payload.sh @@ -7,13 +7,9 @@ set -o nounset script_dir=$(dirname "$(readlink -f "$0")") coco_containerd_repo=${coco_containerd_repo:-"https://github.com/confidential-containers/containerd"} -coco_containerd_version=${coco_containerd_version:-"1.6.8.2"} official_containerd_repo=${official_containerd_repo:-"https://github.com/containerd/containerd"} -official_containerd_version=${official_containerd_version:-"1.7.7"} vfio_gpu_containerd_repo=${vfio_gpu_containerd_repo:-"https://github.com/confidential-containers/containerd"} -vfio_gpu_containerd_version=${vfio_gpu_containerd_version:-"1.7.0.0"} nydus_snapshotter_repo=${nydus_snapshotter_repo:-"https://github.com/containerd/nydus-snapshotter"} -nydus_snapshotter_version=${nydus_snapshotter_version:-"v0.13.13"} containerd_dir="$(mktemp -d -t containerd-XXXXXXXXXX)/containerd" extra_docker_manifest_flags="${extra_docker_manifest_flags:-}"