From 3b9b689ad5cf7449c0b765cf388d556002da8212 Mon Sep 17 00:00:00 2001
From: Yadong Ding <ding_yadong@foxmail.com>
Date: Fri, 25 Aug 2023 21:11:31 +0800
Subject: [PATCH] release: remove containerd

remove containerd in release Dockerfile
update nydus from v2.1.5 to v2.1.6

Signed-off-by: Yadong Ding <ding_yadong@foxmail.com>
---
 script/release/Dockerfile    | 16 +++-------------
 script/release/entrypoint.sh |  2 --
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/script/release/Dockerfile b/script/release/Dockerfile
index 70e9e0ec..0ac225ed 100644
--- a/script/release/Dockerfile
+++ b/script/release/Dockerfile
@@ -1,10 +1,8 @@
 FROM golang:1.18.7 AS build
 
-ARG CONTAINERD_VERSION=1.5.7
-ARG NYDUS_VERSION=v2.1.5
+ARG NYDUS_VERSION=v2.1.6
 
-ARG CONTAINERD_LINUX_AMD64_SHA256SUM="109fc95b86382065ea668005c376360ddcd8c4ec413e7abe220ae9f461e0e173"
-ARG NYDUS_LINUX_AMD64_SHA256SUM="b7e4092d4db33f0bfe6cd8c67d59ccb393ab5d02db7140894297aa23fe9dad3d"
+ARG NYDUS_LINUX_AMD64_SHA256SUM="45c3c4294863725df2597a722767803db8250777fd3c3b85c1f7c29ecc2674be"
 
 # Install acceld
 COPY ./ /accel
@@ -12,13 +10,6 @@ RUN make -C /accel install-check-tools
 RUN make -C /accel check
 RUN make -C /accel
 
-# Install containerd
-RUN wget https://github.com/containerd/containerd/releases/download/v$CONTAINERD_VERSION/containerd-$CONTAINERD_VERSION-linux-amd64.tar.gz
-RUN echo "$CONTAINERD_LINUX_AMD64_SHA256SUM  containerd-$CONTAINERD_VERSION-linux-amd64.tar.gz" | tee containerd-$CONTAINERD_VERSION-linux-amd64.tar.gz.sha256sum
-RUN sha256sum -c containerd-$CONTAINERD_VERSION-linux-amd64.tar.gz.sha256sum
-RUN mkdir -p /usr/local/bin/ && tar xzvf containerd-$CONTAINERD_VERSION-linux-amd64.tar.gz -C /usr/local/
-RUN ls -l /usr/local/bin/
-
 # Install nydus component
 RUN wget https://github.com/dragonflyoss/image-service/releases/download/$NYDUS_VERSION/nydus-static-$NYDUS_VERSION-linux-amd64.tgz
 RUN echo "$NYDUS_LINUX_AMD64_SHA256SUM  nydus-static-$NYDUS_VERSION-linux-amd64.tgz" | tee nydus-static-$NYDUS_VERSION-linux-amd64.tgz.sha256sum
@@ -27,8 +18,7 @@ RUN tar xzvf nydus-static-$NYDUS_VERSION-linux-amd64.tgz && mv nydus-static/nydu
 
 # Build acceld image
 FROM photon:4.0
-COPY --from=build /accel/acceld /accel/accelctl /usr/local/bin/containerd /usr/local/bin/nydus-image /usr/local/bin/
-RUN mkdir /etc/containerd && /usr/local/bin/containerd config default > /etc/containerd/config.toml
+COPY --from=build /accel/acceld /accel/accelctl /usr/local/bin/nydus-image /usr/local/bin/
 COPY ./script/release/entrypoint.sh /entrypoint.sh
 
 ENTRYPOINT [ "/entrypoint.sh" ]
diff --git a/script/release/entrypoint.sh b/script/release/entrypoint.sh
index a9715008..79d7a715 100755
--- a/script/release/entrypoint.sh
+++ b/script/release/entrypoint.sh
@@ -2,6 +2,4 @@
 
 set -eu
 
-/usr/local/bin/containerd &
-sleep 3
 /usr/local/bin/acceld --config $1