Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-05-12 19:20:42 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#32444: doc: swap "Docker image" for "container image"

Browse Source 
1372eb09c5 doc: swap "Docker image" for "container image" (fanquake)

Pull request description:

  I haven't used Docker for some time (now Podman), and the images are generic, so just use "container image". I'll be pushing some changes to https://github.com/fanquake/core-review/tree/master/guix, to reflect this.

ACKs for top commit:
  janb84:
    ACK 1372eb09c5
  laanwj:
    ACK 1372eb09c5
  hebasto:
    ACK 1372eb09c5.

Tree-SHA512: 45bb74d25a0faf7e5c3666d6897fb6b999144308c43cdf8a290d3a4210285b1e95286d27bb3d90bc50be4784c2242ad3f93794086f4634439a46a48ff68c7343
This commit is contained in:
merge-script 2025-05-08 13:50:24 +01:00
commit 66c968b4b4
No known key found for this signature in database
GPG Key ID: 2EEB9F5CC09526C1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/guix/INSTALL.md
View File

@ -18,10 +18,10 @@ Otherwise, you may choose from one of the following options to install Guix:
- Works on nearly all Linux distributions
- Installs any release
- Binary installation only, requires high level of trust
3. Using fanquake's **Docker image** [↗︎ external instructions][install-fanquake-docker]
3. Using fanquake's **container image** [↗︎ external instructions][install-fanquake-container]
- Maintained by fanquake
- Easy (automatically performs *some* setup)
- Works wherever Docker images work
- Works wherever container images work (Docker/Podman)
- Installs any release
- Binary installation only, requires high level of trust
4. Using a **distribution-maintained package** [⤓ skip to section][install-distro-pkg]
@ -57,7 +57,7 @@ Regardless of which installation option you chose, the changes to
`/etc/profile.d` will not take effect until the next shell or desktop session,
so you should log out and log back in.
## Option 3: Using fanquake's Docker image
## Option 3: Using fanquake's container image
Please refer to fanquake's instructions
[here](https://github.com/fanquake/core-review/tree/master/guix).
@ -415,7 +415,7 @@ make it "what Guix intended", then read the next few subsections.
This section definitely does not apply to you if you installed Guix using:
1. The shell installer script
2. fanquake's Docker image
2. fanquake's container image
3. Debian's `guix` package
#### Background
@ -766,7 +766,7 @@ Please see the following links for more details:
[install-script]: #options-1-and-2-using-the-official-shell-installer-script-or-binary-tarball
[install-bin-tarball]: #options-1-and-2-using-the-official-shell-installer-script-or-binary-tarball
[install-fanquake-docker]: #option-3-using-fanquakes-docker-image
[install-fanquake-container]: #option-3-using-fanquakes-container-image
[install-distro-pkg]: #option-4-using-a-distribution-maintained-package
[install-source]: #option-5-building-from-source