Release: nydus-snapshotter naming fixes

A few tweaks to pull the correct nydus-snapshotter tarball are needed: the remote repo, the tarball suffix, the "linux" string within the tarball name, and no need for amd64-x86_64 checking Signed-off-by: Chris Porter <[email protected]>
confidential-containers · Apr 24, 2024 · 831dca3 · 831dca3
1 parent 6be3af2
commit 831dca3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/install/pre-install-payload/Dockerfile b/install/pre-install-payload/Dockerfile
@@ -69,10 +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 && \
+    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 / && \
+    rm nydus-snapshotter-${NYDUS_SNAPSHOTTER_VERSION}-linux-${ARCH}.tar.gz && \
     mv /nydus-snapshotter/* ${NODE_DESTINATION}/bin/ && \
     rm -rf /nydus-snapshotter
 

diff --git 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:-}"