Skip to content

Commit 2b9f73c

Browse files
authored
Merge pull request #923 from AkihiroSuda/clarify-p2p-optional
docs: clarify that P2P image distribution (IPFS) is completely optional
2 parents ac5b235 + d8167e0 commit 2b9f73c

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

README.md

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,20 @@
1111

1212
✅ Supports Docker Compose (`nerdctl compose up`)
1313

14-
✅ Supports [rootless mode, without slirp overhead](./docs/rootless.md) (`nerdctl run --label nerdctl/bypass4netns=true`)
14+
[Optional] Supports [rootless mode, without slirp overhead (bypass4netns)](./docs/rootless.md)
1515

16-
✅ Supports [lazy-pulling (Stargz)](./docs/stargz.md)
16+
[Optional] Supports [lazy-pulling (Stargz)](./docs/stargz.md)
1717

18-
✅ Supports [encrypted images (ocicrypt)](./docs/ocicrypt.md)
18+
[Optional] Supports [encrypted images (ocicrypt)](./docs/ocicrypt.md)
1919

20-
✅ Supports [P2P image distribution (IPFS)](./docs/ipfs.md)
20+
[Optional] Supports [P2P image distribution (IPFS)](./docs/ipfs.md) (\*1)
2121

22-
✅ Supports [container image signing and verifying (cosign)](./docs/cosign.md)
22+
[Optional] Supports [container image signing and verifying (cosign)](./docs/cosign.md)
2323

2424
nerdctl is a **non-core** sub-project of containerd.
2525

26+
\*1: P2P image distribution (IPFS) is completely optional. Your host is NOT connected to any P2P network, unless you opt in to [install and run IPFS daemon](https://docs.ipfs.io/install/).
27+
2628
## Examples
2729

2830
### Basic usage
@@ -153,7 +155,8 @@ Also, `nerdctl` might be potentially useful for debugging Kubernetes clusters, b
153155
Major:
154156
- [On-demand image pulling (lazy-pulling) using Stargz Snapshotter](./docs/stargz.md): `nerdctl --snapshotter=stargz run IMAGE` .
155157
- [Image encryption and decryption using ocicrypt (imgcrypt)](./docs/ocicrypt.md): `nerdctl image (encrypt|decrypt) SRC DST`
156-
- [P2P image distribution using IPFS](./docs/ipfs.md): `nerdctl run ipfs://CID`
158+
- [P2P image distribution using IPFS](./docs/ipfs.md): `nerdctl run ipfs://CID` .
159+
P2P image distribution (IPFS) is completely optional. Your host is NOT connected to any P2P network, unless you opt in to [install and run IPFS daemon](https://docs.ipfs.io/install/).
157160
- Recursive read-only (RRO) bind-mount: `nerdctl run -v /mnt:/mnt:rro` (make children such as `/mnt/usb` to be read-only, too).
158161
Requires kernel >= 5.12, and crun >= 1.4 or runc >= 1.1 (PR [#3272](https://github.com/opencontainers/runc/pull/3272)).
159162
- [Cosign integration](./docs/cosign.md): `nerdctl pull --verify=cosign` and `nerdctl push --sign=cosign`
@@ -1359,6 +1362,8 @@ Flags:
13591362

13601363
## IPFS management
13611364

1365+
P2P image distribution (IPFS) is completely optional. Your host is NOT connected to any P2P network, unless you opt in to [install and run IPFS daemon](https://docs.ipfs.io/install/).
1366+
13621367
### :nerd_face: nerdctl ipfs registry up
13631368
Start read-only local registry backed by IPFS.
13641369
See [`./docs/ipfs.md`](./docs/ipfs.md) for details.

docs/ipfs.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
You can distribute container images without registries, using IPFS.
44

5+
IPFS support is completely optional. Your host is NOT connected to any P2P network, unless you opt in to [install and run IPFS daemon](https://docs.ipfs.io/install/).
6+
57
## Prerequisites
68

79
To use this feature, make sure `ipfs daemon` is running on your host.

go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ require (
106106
github.com/jbenet/goprocess v0.1.4 // indirect
107107
github.com/klauspost/compress v1.15.1 // indirect
108108
github.com/klauspost/cpuid/v2 v2.0.6 // indirect
109+
// NOTE: P2P image distribution (IPFS) is completely optional. Your host is NOT connected to any P2P network, unless you opt in to install and run IPFS daemon.
109110
github.com/libp2p/go-buffer-pool v0.0.2 // indirect
110111
github.com/libp2p/go-libp2p-core v0.8.6 // indirect
111112
github.com/libp2p/go-openssl v0.0.7 // indirect

0 commit comments

Comments
 (0)