Add installation note about flavour, support special cases (#222)

Fixes #210

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/222

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 32db2f1c5a8c160033e4df0833dc2e0e2cc09918..cd1285eccf17a63510e9a7a44265d742ab778e46 100644 (file)
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -14,6 +14,14 @@ variables:
         - stable
         - refs/tags/v*
         - refs/tags/stable-*
+  - &on-stable
+    when:
+      event:
+        - push
+        - tag
+      branch:
+        - stable
+        - refs/tags/stable-*
   - &on-point-release
     when:
       event:
@@ -110,6 +118,8 @@ pipeline:
       - export SOURCE=akkoma-ubuntu-jammy.zip
       - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-ubuntu-jammy.zip
       - /bin/sh /entrypoint.sh
+      - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-amd64-ubuntu-jammy.zip
+      - /bin/sh /entrypoint.sh
 
   debian-bullseye:
     image: elixir:1.13.4
@@ -142,7 +152,7 @@ pipeline:
   # Canonical amd64-musl
   musl:
     image: elixir:1.13.4-alpine
-    <<: *on-release
+    <<: *on-stable
     environment:
       MIX_ENV: prod
     commands:
@@ -157,7 +167,7 @@ pipeline:
 
   release-musl:
     image: akkoma/releaser
-    <<: *on-release
+    <<: *on-stable
     secrets: *scw-secrets
     commands:
       - export SOURCE=akkoma-amd64-musl.zip

diff --git a/docs/docs/administration/updating.md b/docs/docs/administration/updating.md
index 6f7ffcd6308599fb9f28a300632d7f146269f830..2d9e77075dbb66b4852f9422b2bead9ff310c7fc 100644 (file)
--- a/docs/docs/administration/updating.md
+++ b/docs/docs/administration/updating.md
@@ -14,6 +14,10 @@ su akkoma -s $SHELL -lc "./bin/pleroma_ctl update"
 su akkoma -s $SHELL -lc "./bin/pleroma_ctl migrate"
 ```
 
+If you selected an alternate flavour on installation, 
+you _may_ need to specify `--flavour`, in the same way as 
+[when installing](../../installation/otp_en#detecting-flavour).
+
 ## For from source installations (using git)
 
 1. Go to the working directory of Akkoma (default is `/opt/akkoma`)

diff --git a/docs/docs/installation/otp_en.md b/docs/docs/installation/otp_en.md
index 329afe967de0ae3d1d967f6a2acc32f0b4615ecb..3e00d3262e78af0edfa0dc9f47bae587955cf119 100644 (file)
--- a/docs/docs/installation/otp_en.md
+++ b/docs/docs/installation/otp_en.md
@@ -19,12 +19,12 @@ This is a little more complex than it used to be (thanks ubuntu)
 
 Use the following mapping to figure out your flavour:
 
-| distribution  | flavour      |
-| ------------- | ------------ |
-| debian stable | amd64        |
-| ubuntu focal  | amd64        |
-| ubuntu jammy  | ubuntu-jammy |
-| alpine        | amd64-musl   |
+| distribution  | flavour            | available branches  |
+| ------------- | ------------------ | ------------------- |
+| debian stable | amd64              | develop, stable     |
+| ubuntu focal  | amd64              | develop, stable     |
+| ubuntu jammy  | amd64-ubuntu-jammy | develop, stable     |
+| alpine        | amd64-musl         | stable              |
 
 Other similar distributions will _probably_ work, but if it is not listed above, there is no official
 support.

diff --git a/rel/files/bin/pleroma_ctl b/rel/files/bin/pleroma_ctl
index d2949e8fed922b740ff05040ffcc1090b1c9e749..e0e6d1b5af867bfae4b44c4ccf68c4b3a2c5ac82 100755 (executable)
--- a/rel/files/bin/pleroma_ctl
+++ b/rel/files/bin/pleroma_ctl
@@ -2,28 +2,24 @@
 # XXX: This should be removed when elixir's releases get custom command support
 
 detect_flavour() {
-       arch="$(uname -m)"
-       if [ "$arch" = "x86_64" ]; then
-               arch="amd64"
-       elif [ "$arch" = "aarch64" ]; then
-               arch="arm64"
-       else
-               echo "Unsupported arch: $arch" >&2
-               exit 1
-       fi
-
-       if getconf GNU_LIBC_VERSION >/dev/null; then
-               libc_postfix=""
-       elif [ "$(ldd 2>&1 | head -c 9)" = "musl libc" ]; then
-               libc_postfix="-musl"
-       elif [ "$(find /lib/libc.musl* | wc -l)" ]; then
-               libc_postfix="-musl"
-       else
-               echo "Unsupported libc" >&2
-               exit 1
-       fi
-
-       echo "$arch$libc_postfix"
+    arch="amd64"
+    # Special cases
+    if grep -qe "VERSION_CODENAME=jammy" /etc/os-release; then
+        echo "$arch-ubuntu-jammy"
+    else
+        if getconf GNU_LIBC_VERSION >/dev/null; then
+                 libc_postfix=""
+           elif [ "$(ldd 2>&1 | head -c 9)" = "musl libc" ]; then
+                 libc_postfix="-musl"
+           elif [ "$(find /lib/libc.musl* | wc -l)" ]; then
+                 libc_postfix="-musl"
+           else
+                 echo "Unsupported libc" >&2
+                 exit 1
+           fi
+
+           echo "$arch$libc_postfix"
+    fi
 }
 
 detect_branch() {