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.

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

chore: remove ctr-remote and use nerdctl #1623

Merged
merged 2 commits into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,13 @@ jobs:
- name: build contrib go components
run: |
make -e GOARCH=${{ matrix.arch }} contrib-release
sudo mv contrib/ctr-remote/bin/ctr-remote .
sudo mv contrib/nydusify/cmd/nydusify .
sudo mv contrib/nydus-overlayfs/bin/nydus-overlayfs .
- name: store-artifacts
uses: actions/upload-artifact@v4
with:
name: nydus-artifacts-linux-${{ matrix.arch }}-contrib
path: |
ctr-remote
nydusify
nydus-overlayfs
containerd-nydus-grpc
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/smoke.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ jobs:
matrix:
include:
- path: contrib/nydusify
- path: contrib/ctr-remote
- path: contrib/nydus-overlayfs
steps:
- name: Checkout
Expand Down
31 changes: 5 additions & 26 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ endif
endif
RUST_TARGET_STATIC ?= $(STATIC_TARGET)

CTR-REMOTE_PATH = contrib/ctr-remote
NYDUSIFY_PATH = contrib/nydusify
NYDUS-OVERLAYFS_PATH = contrib/nydus-overlayfs

Expand Down Expand Up @@ -138,23 +137,18 @@ smoke-takeover:

smoke: release smoke-only

contrib-build: nydusify ctr-remote nydus-overlayfs
contrib-build: nydusify nydus-overlayfs

contrib-release: nydusify-release ctr-remote-release \
nydus-overlayfs-release
contrib-release: nydusify-release nydus-overlayfs-release

contrib-test: nydusify-test ctr-remote-test \
nydus-overlayfs-test
contrib-test: nydusify-test nydus-overlayfs-test

contrib-lint: nydusify-lint ctr-remote-lint \
nydus-overlayfs-lint
contrib-lint: nydusify-lint nydus-overlayfs-lint

contrib-clean: nydusify-clean ctr-remote-clean \
nydus-overlayfs-clean
contrib-clean: nydusify-clean nydus-overlayfs-clean

contrib-install:
@sudo mkdir -m 755 -p $(INSTALL_DIR_PREFIX)
@sudo install -m 755 contrib/ctr-remote/bin/ctr-remote $(INSTALL_DIR_PREFIX)/ctr-remote
@sudo install -m 755 contrib/nydus-overlayfs/bin/nydus-overlayfs $(INSTALL_DIR_PREFIX)/nydus-overlayfs
@sudo install -m 755 contrib/nydusify/cmd/nydusify $(INSTALL_DIR_PREFIX)/nydusify

Expand All @@ -173,21 +167,6 @@ nydusify-clean:
nydusify-lint:
$(call build_golang,${NYDUSIFY_PATH},make lint)

ctr-remote:
$(call build_golang,${CTR-REMOTE_PATH},make)

ctr-remote-release:
$(call build_golang,${CTR-REMOTE_PATH},make release)

ctr-remote-test:
$(call build_golang,${CTR-REMOTE_PATH},make test)

ctr-remote-clean:
$(call build_golang,${CTR-REMOTE_PATH},make clean)

ctr-remote-lint:
$(call build_golang,${CTR-REMOTE_PATH},make lint)

nydus-overlayfs:
$(call build_golang,${NYDUS-OVERLAYFS_PATH},make)

Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ The following Benchmarking results demonstrate that Nydus images significantly o
| [nydus-image](https://github.com/dragonflyoss/nydus/blob/master/docs/nydus-image.md) | Convert a single layer of OCI format container image into a nydus format container image generating meta part file and data part file respectively |
| [nydusify](https://github.com/dragonflyoss/nydus/blob/master/docs/nydusify.md) | It pulls OCI image down and unpack it, invokes `nydus-image create` to convert image and then pushes the converted image back to registry and data storage |
| [nydusctl](https://github.com/dragonflyoss/nydus/blob/master/docs/nydus-image.md) | Nydusd CLI client (`nydus-image inspect`), query daemon's working status/metrics and configure it |
| [ctr-remote](https://github.com/dragonflyoss/nydus/tree/master/contrib/ctr-remote) | An enhanced `containerd` CLI tool enable nydus support with `containerd` ctr |
| [nydus-docker-graphdriver](https://github.com/nydusaccelerator/docker-nydus-graphdriver) | [Experimental] Works as a `docker` remote graph driver to control how images and containers are stored and managed |
| [nydus-overlayfs](https://github.com/dragonflyoss/nydus/tree/master/contrib/nydus-overlayfs) | `Containerd` mount helper to invoke overlayfs mount with tweaking mount options a bit. So nydus prerequisites can be passed to vm-based runtime |
| [nydus-backend-proxy](./contrib/nydus-backend-proxy/README.md) | A simple HTTP server to serve local directory as a blob backend for nydusd |
Expand Down
1 change: 0 additions & 1 deletion contrib/ctr-remote/.gitignore

This file was deleted.

18 changes: 0 additions & 18 deletions contrib/ctr-remote/.golangci.yml

This file was deleted.

29 changes: 0 additions & 29 deletions contrib/ctr-remote/Makefile

This file was deleted.

67 changes: 0 additions & 67 deletions contrib/ctr-remote/cmd/main.go

This file was deleted.

103 changes: 0 additions & 103 deletions contrib/ctr-remote/commands/rpull.go

This file was deleted.

84 changes: 0 additions & 84 deletions contrib/ctr-remote/go.mod

This file was deleted.

Loading
Loading