From 0413af8478ff79d04dbc897405e5dc584ccf651e Mon Sep 17 00:00:00 2001 From: Joe Mooring Date: Fri, 13 Oct 2023 08:08:45 -0700 Subject: [PATCH] Remove Docker notes from installation instructions Closes #2260 --- ...from-source.md => 04-build-from-source.md} | 0 content/en/installation/_common/04-docker.md | 10 ---------- content/en/installation/bsd.md | 2 +- content/en/installation/linux.md | 19 ++++++++----------- content/en/installation/macos.md | 18 ++++++++---------- content/en/installation/windows.md | 18 ++++++++---------- 6 files changed, 25 insertions(+), 42 deletions(-) rename content/en/installation/_common/{05-build-from-source.md => 04-build-from-source.md} (100%) delete mode 100644 content/en/installation/_common/04-docker.md diff --git a/content/en/installation/_common/05-build-from-source.md b/content/en/installation/_common/04-build-from-source.md similarity index 100% rename from content/en/installation/_common/05-build-from-source.md rename to content/en/installation/_common/04-build-from-source.md diff --git a/content/en/installation/_common/04-docker.md b/content/en/installation/_common/04-docker.md deleted file mode 100644 index 24f5cd942f..0000000000 --- a/content/en/installation/_common/04-docker.md +++ /dev/null @@ -1,10 +0,0 @@ -## Docker - -[Erlend Klakegg Bergheim] graciously maintains [Docker images] based on images for Alpine Linux, Busybox, Debian, and Ubuntu. - -```sh -docker pull klakegg/hugo -``` - -[Docker images]: https://hub.docker.com/r/klakegg/hugo -[Erlend Klakegg Bergheim]: https://github.com/klakegg diff --git a/content/en/installation/bsd.md b/content/en/installation/bsd.md index e767b5c08c..999e52ad6d 100644 --- a/content/en/installation/bsd.md +++ b/content/en/installation/bsd.md @@ -61,7 +61,7 @@ doas pkg_add hugo [OpenBSD]: https://www.openbsd.org/ -{{% readfile file="/installation/_common/05-build-from-source.md" %}} +{{% readfile file="/installation/_common/04-build-from-source.md" %}} ## Comparison diff --git a/content/en/installation/linux.md b/content/en/installation/linux.md index aec811cbde..2dbbd37200 100644 --- a/content/en/installation/linux.md +++ b/content/en/installation/linux.md @@ -124,20 +124,17 @@ sudo eopkg install hugo [Solus]: https://getsol.us/ -{{% readfile file="/installation/_common/04-docker.md" %}} - -{{% readfile file="/installation/_common/05-build-from-source.md" %}} +{{% readfile file="/installation/_common/04-build-from-source.md" %}} ## Comparison -||Prebuilt binaries|Package managers|Repository packages|Docker|Build from source -:--|:--:|:--:|:--:|:--:|:--: -Easy to install?|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark: -Easy to upgrade?|:heavy_check_mark:|:heavy_check_mark:|varies|:heavy_check_mark:|:heavy_check_mark: -Easy to downgrade?|:heavy_check_mark:|:heavy_check_mark: [^1]|varies|:heavy_check_mark:|:heavy_check_mark: -Automatic updates?|:x:|varies [^2]|:x:|:x: [^3]|:x: -Latest version available?|:heavy_check_mark:|:heavy_check_mark:|varies|:heavy_check_mark:|:heavy_check_mark: +||Prebuilt binaries|Package managers|Repository packages|Build from source +:--|:--:|:--:|:--:|:--: +Easy to install?|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark: +Easy to upgrade?|:heavy_check_mark:|:heavy_check_mark:|varies|:heavy_check_mark: +Easy to downgrade?|:heavy_check_mark:|:heavy_check_mark: [^1]|varies|:heavy_check_mark: +Automatic updates?|:x:|varies [^2]|:x:|:x: +Latest version available?|:heavy_check_mark:|:heavy_check_mark:|varies|:heavy_check_mark: [^1]: Easy if a previous version is still installed. [^2]: Snap packages are automatically updated. Homebrew requires advanced configuration. -[^3]: Possible but requires advanced configuration. diff --git a/content/en/installation/macos.md b/content/en/installation/macos.md index d1b77d853c..ccae90b36b 100644 --- a/content/en/installation/macos.md +++ b/content/en/installation/macos.md @@ -29,19 +29,17 @@ sudo port install hugo [MacPorts]: https://www.macports.org/ -{{% readfile file="/installation/_common/04-docker.md" %}} - -{{% readfile file="/installation/_common/05-build-from-source.md" %}} +{{% readfile file="/installation/_common/04-build-from-source.md" %}} ## Comparison -||Prebuilt binaries|Package managers|Docker|Build from source -:--|:--:|:--:|:--:|:--:|:--: -Easy to install?|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| -Easy to upgrade?|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark: -Easy to downgrade?|:heavy_check_mark:|:heavy_check_mark: [^1]|:heavy_check_mark:|:heavy_check_mark: -Automatic updates?|:x:|:x: [^2]|:x: [^2]|:x: -Latest version available?|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark: +||Prebuilt binaries|Package managers|Build from source +:--|:--:|:--:|:--: +Easy to install?|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| +Easy to upgrade?|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark: +Easy to downgrade?|:heavy_check_mark:|:heavy_check_mark: [^1]|:heavy_check_mark: +Automatic updates?|:x:|:x: [^2]|:x: +Latest version available?|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark: [^1]: Easy if a previous version is still installed. [^2]: Possible but requires advanced configuration. diff --git a/content/en/installation/windows.md b/content/en/installation/windows.md index 949e947763..48c5f7006c 100644 --- a/content/en/installation/windows.md +++ b/content/en/installation/windows.md @@ -47,9 +47,7 @@ winget install Hugo.Hugo.Extended [Winget]: https://learn.microsoft.com/en-us/windows/package-manager/ -{{% readfile file="/installation/_common/04-docker.md" %}} - -{{% readfile file="/installation/_common/05-build-from-source.md" %}} +{{% readfile file="/installation/_common/04-build-from-source.md" %}} {{% note %}} See these [detailed instructions](https://discourse.gohugo.io/t/41370) to install GCC on Windows. @@ -57,13 +55,13 @@ See these [detailed instructions](https://discourse.gohugo.io/t/41370) to instal ## Comparison -||Prebuilt binaries|Package managers|Docker|Build from source -:--|:--:|:--:|:--:|:--:|:--: -Easy to install?|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| -Easy to upgrade?|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark: -Easy to downgrade?|:heavy_check_mark:|:heavy_check_mark: [^2]|:heavy_check_mark:|:heavy_check_mark: -Automatic updates?|:x:|:x: [^1]|:x: [^1]|:x: -Latest version available?|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark: +||Prebuilt binaries|Package managers|Build from source +:--|:--:|:--:|:--: +Easy to install?|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| +Easy to upgrade?|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark: +Easy to downgrade?|:heavy_check_mark:|:heavy_check_mark: [^2]|:heavy_check_mark: +Automatic updates?|:x:|:x: [^1]|:x: +Latest version available?|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark: [^1]: Possible but requires advanced configuration. [^2]: Easy if a previous version is still installed.