From 32559a5aea83f0a92a66950f27c19d338fda27f9 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Tue, 20 Jun 2023 18:21:43 +0100 Subject: [PATCH] Make custom wikicafe image optional, non-default --- .env.sample | 3 +++ compose.wikicafe.yml | 6 ++++++ compose.yml | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 compose.wikicafe.yml diff --git a/.env.sample b/.env.sample index 2f42aa8..ca9f479 100644 --- a/.env.sample +++ b/.env.sample @@ -7,6 +7,9 @@ LETS_ENCRYPT_ENV=production COMPOSE_FILE="compose.yml" +# custom wiki.cafe image, for working oauth2 support +#COMPOSE_FILE="$COMPOSE_FILE:compose.wikicafe.yml" + # Predefined "owner" security #COMPOSE_FILE="$COMPOSE_FILE:compose.owner.yml" diff --git a/compose.wikicafe.yml b/compose.wikicafe.yml new file mode 100644 index 0000000..7b267f5 --- /dev/null +++ b/compose.wikicafe.yml @@ -0,0 +1,6 @@ +--- +version: "3.8" + +services: + app: + image: git.coopcloud.tech/wiki-cafe/wiki-farm:latest diff --git a/compose.yml b/compose.yml index 43ac570..8da7610 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: git.coopcloud.tech/wiki-cafe/wiki-farm:latest + image: dobbs/farm:1.0.13 command: /bin/sh config/install.sh volumes: - "fedwiki_friends:/home/node/config"