A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
fix(installer): point Fedora at podman with docker-compose (#3121)
Hampus603b93653608
diff --git a/fluxer_docs/src/installer/install.sh b/fluxer_docs/src/installer/install.shindex 3e3040ae1..82721a829 100644--- a/fluxer_docs/src/installer/install.sh+++ b/fluxer_docs/src/installer/install.sh@@ -449,8 +449,12 @@ fluxer_docker_hint() {printf '%s' 'On Debian and Ubuntu, follow https://docs.docker.com/engine/install/ and install docker-ce with docker-compose-plugin. The distribution docker.io package ships no Compose plugin.'return 0fi+ if grep -qE '^ID="?fedora"?$' /etc/os-release 2>/dev/null; then+ printf '%s' 'On Fedora, install Podman and Docker Compose with dnf install -y podman docker-compose, then start the Podman API socket with systemctl --user enable --now podman.socket. podman compose runs docker-compose ahead of podman-compose, which lacks commands this script runs.'+ return 0+ fiif command -v dnf >/dev/null 2>&1; then- printf '%s' 'On Fedora, RHEL and derivatives, follow https://docs.docker.com/engine/install/ and install docker-ce with docker-compose-plugin.'+ printf '%s' 'On RHEL and derivatives, follow https://docs.docker.com/engine/install/ and install docker-ce with docker-compose-plugin.'return 0fiif command -v zypper >/dev/null 2>&1; then@@ -553,6 +557,9 @@ fluxer_preflight() {if ! $fluxer_engine compose version >/dev/null 2>&1; thenfluxer_fail 2 "$fluxer_engine has no compose subcommand. $(fluxer_docker_hint)"fi+ if $fluxer_engine compose version 2>/dev/null | grep -q '^podman-compose version'; then+ fluxer_fail 2 "$fluxer_engine compose runs podman-compose, which lacks compose ps -a and compose config --images that this script runs. $(fluxer_docker_hint)"+ fifluxer_engine_report=$($fluxer_engine --version 2>/dev/null)fluxer_engine_kind=$(printf '%s\n' "$fluxer_engine_report" | sed -n 's/^\([A-Za-z][A-Za-z]*\) version .*/\1/p' | tr 'A-Z' 'a-z')fluxer_engine_version=$(printf '%s\n' "$fluxer_engine_report" | sed -n 's/^[A-Za-z][A-Za-z]* version v\{0,1\}\([0-9][0-9.]*\).*/\1/p')