diff --git a/install/pre-install-payload/Dockerfile b/install/pre-install-payload/Dockerfile index bc144737..67424913 100644 --- a/install/pre-install-payload/Dockerfile +++ b/install/pre-install-payload/Dockerfile @@ -69,12 +69,9 @@ ENV GOARCH=${ARCH} RUN mkdir -p ${NODE_DESTINATION}/bin && \ apk add --no-cache curl && \ - if [ "${ARCH}" = "amd64" ]; then ARCH=x86_64; fi && \ - curl -fOL --progress-bar ${NYDUS_SNAPSHOTTER_REPO}/releases/download/${NYDUS_SNAPSHOTTER_VERSION}/nydus-snapshotter-${NYDUS_SNAPSHOTTER_VERSION}-${ARCH}.tgz && \ - tar xvzpf nydus-snapshotter-${NYDUS_SNAPSHOTTER_VERSION}-${ARCH}.tgz -C / && \ - rm nydus-snapshotter-${NYDUS_SNAPSHOTTER_VERSION}-${ARCH}.tgz && \ - mv /nydus-snapshotter/* ${NODE_DESTINATION}/bin/ && \ - rm -rf /nydus-snapshotter + curl -fOL --progress-bar ${NYDUS_SNAPSHOTTER_REPO}/releases/download/${NYDUS_SNAPSHOTTER_VERSION}/nydus-snapshotter-${NYDUS_SNAPSHOTTER_VERSION}-linux-${ARCH}.tar.gz && \ + tar xvzpf nydus-snapshotter-${NYDUS_SNAPSHOTTER_VERSION}-linux-${ARCH}.tar.gz -C ${NODE_DESTINATION} && \ + rm nydus-snapshotter-${NYDUS_SNAPSHOTTER_VERSION}-linux-${ARCH}.tar.gz #### kubectl diff --git a/install/pre-install-payload/Makefile b/install/pre-install-payload/Makefile index 35288e68..b937621a 100644 --- a/install/pre-install-payload/Makefile +++ b/install/pre-install-payload/Makefile @@ -1,7 +1,7 @@ COCO_CONTAINERD_VERSION = 1.6.8.2 OFFICIAL_CONTAINERD_VERSION = 1.7.7 VFIO_GPU_CONTAINERD_VERSION = 1.7.0.0 -NYDUS_SNAPSHOTTER_VERSION = v0.13.3-multiarch +NYDUS_SNAPSHOTTER_VERSION = v0.13.11 BASH = bash diff --git a/install/pre-install-payload/payload.sh b/install/pre-install-payload/payload.sh index 7adf0d00..20c60576 100755 --- a/install/pre-install-payload/payload.sh +++ b/install/pre-install-payload/payload.sh @@ -12,7 +12,7 @@ official_containerd_repo=${official_containerd_repo:-"https://github.com/contain 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/fidencio/nydus-snapshotter"} +nydus_snapshotter_repo=${nydus_snapshotter_repo:-"https://github.com/containerd/nydus-snapshotter"} nydus_snapshotter_version=${nydus_snapshotter_version:-"v0.13.3-multiarch"} containerd_dir="$(mktemp -d -t containerd-XXXXXXXXXX)/containerd" extra_docker_manifest_flags="${extra_docker_manifest_flags:-}"