Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release: remove containerd #176

Merged
merged 1 commit into from
Aug 28, 2023
Merged

release: remove containerd #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions script/release/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,15 @@
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
imeoer marked this conversation as resolved.
Show resolved Hide resolved

ARG CONTAINERD_LINUX_AMD64_SHA256SUM="109fc95b86382065ea668005c376360ddcd8c4ec413e7abe220ae9f461e0e173"
ARG NYDUS_LINUX_AMD64_SHA256SUM="b7e4092d4db33f0bfe6cd8c67d59ccb393ab5d02db7140894297aa23fe9dad3d"
ARG NYDUS_LINUX_AMD64_SHA256SUM="45c3c4294863725df2597a722767803db8250777fd3c3b85c1f7c29ecc2674be"

# Install acceld
COPY ./ /accel
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
Expand All @@ -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" ]
2 changes: 0 additions & 2 deletions script/release/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@

set -eu

/usr/local/bin/containerd &
sleep 3
/usr/local/bin/acceld --config $1