Add installation note about flavour, support special cases #222

Merged
floatingghost merged 3 commits from update-flavour-detection into develop 2022-09-20 11:04:27 +00:00
4 changed files with 39 additions and 29 deletions

View file

@ -14,6 +14,14 @@ variables:
- stable - stable
- refs/tags/v* - refs/tags/v*
- refs/tags/stable-* - refs/tags/stable-*
- &on-stable
when:
event:
- push
- tag
branch:
- stable
- refs/tags/stable-*
- &on-point-release - &on-point-release
when: when:
event: event:
@ -110,6 +118,8 @@ pipeline:
- export SOURCE=akkoma-ubuntu-jammy.zip - export SOURCE=akkoma-ubuntu-jammy.zip
- export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-ubuntu-jammy.zip - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-ubuntu-jammy.zip
- /bin/sh /entrypoint.sh - /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: debian-bullseye:
image: elixir:1.13.4 image: elixir:1.13.4
@ -142,7 +152,7 @@ pipeline:
# Canonical amd64-musl # Canonical amd64-musl
musl: musl:
image: elixir:1.13.4-alpine image: elixir:1.13.4-alpine
<<: *on-release <<: *on-stable
environment: environment:
MIX_ENV: prod MIX_ENV: prod
commands: commands:
@ -157,7 +167,7 @@ pipeline:
release-musl: release-musl:
image: akkoma/releaser image: akkoma/releaser
<<: *on-release <<: *on-stable
secrets: *scw-secrets secrets: *scw-secrets
commands: commands:
- export SOURCE=akkoma-amd64-musl.zip - export SOURCE=akkoma-amd64-musl.zip

View file

@ -14,6 +14,10 @@ su akkoma -s $SHELL -lc "./bin/pleroma_ctl update"
su akkoma -s $SHELL -lc "./bin/pleroma_ctl migrate" 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) ## For from source installations (using git)
1. Go to the working directory of Akkoma (default is `/opt/akkoma`) 1. Go to the working directory of Akkoma (default is `/opt/akkoma`)

View file

@ -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: Use the following mapping to figure out your flavour:
| distribution | flavour | | distribution | flavour | available branches |
| ------------- | ------------ | | ------------- | ------------------ | ------------------- |
| debian stable | amd64 | | debian stable | amd64 | develop, stable |
| ubuntu focal | amd64 | | ubuntu focal | amd64 | develop, stable |
| ubuntu jammy | ubuntu-jammy | | ubuntu jammy | amd64-ubuntu-jammy | develop, stable |
| alpine | amd64-musl | | alpine | amd64-musl | stable |
Other similar distributions will _probably_ work, but if it is not listed above, there is no official Other similar distributions will _probably_ work, but if it is not listed above, there is no official
support. support.

View file

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