From 4c195edb17a13c727376fb9686ecdcd1349e591f Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Sat, 5 Aug 2023 16:07:10 +0200
Subject: [PATCH] chore: publish 0.2.0+0.18.3 release

---
 abra.sh       |  2 +-
 compose.yml   | 17 +++++++++--------
 entrypoint.sh |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/abra.sh b/abra.sh
index c16890a..056db81 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,3 +1,3 @@
 export NGINX_CONF_VERSION=v5
-export ENTRYPOINT_APP_VERSION=v2
+export ENTRYPOINT_APP_VERSION=v3
 export CONFIG_HJSON_VERSION=v4
diff --git a/compose.yml b/compose.yml
index 036ddb7..7443745 100644
--- a/compose.yml
+++ b/compose.yml
@@ -3,7 +3,8 @@ version: "3.8"
 
 services:
   app:
-    image: dessalines/lemmy:0.16.6
+    user: 0:0
+    image: dessalines/lemmy:0.18.3
     environment:
       - RUST_LOG="warn,lemmy_server=info,lemmy_api=info,lemmy_api_common=info,lemmy_api_crud=info,lemmy_apub=info,lemmy_db_schema=info,lemmy_db_views=info,lemmy_db_views_actor=info,lemmy_db_views_moderator=info,lemmy_routes=info,lemmy_utils=info,lemmy_websocket=info"
       - DOMAIN
@@ -34,19 +35,19 @@ services:
       restart_policy:
         condition: on-failure
       labels:
-        - "coop-cloud.${STACK_NAME}.version=0.1.0+0.16.6"
+        - "coop-cloud.${STACK_NAME}.version=0.2.0+0.18.3"
     healthcheck:
       test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8536/api/v3/site"]
       interval: 30s
       timeout: 10s
       retries: 10
-      start_period: 1m
+      start_period: 5m
 
   ui:
-    image: dessalines/lemmy-ui:0.16.6
+    image: dessalines/lemmy-ui:0.18.3
     environment:
-      - "LEMMY_INTERNAL_HOST=${STACK_NAME}_app:8536"
-      - "LEMMY_EXTERNAL_HOST=${DOMAIN}"
+      - "LEMMY_UI_LEMMY_INTERNAL_HOST=${STACK_NAME}_app:8536"
+      - "LEMMY_UI_LEMMY_EXTERNAL_HOST=${DOMAIN}"
       # - LEMMY_HTTPS=true
     networks:
       - backend
@@ -60,7 +61,7 @@ services:
       start_period: 1m
 
   db:
-    image: postgres:12-alpine
+    image: postgres:15-alpine
     environment:
       - POSTGRES_USER=lemmy
       - POSTGRES_DB=lemmy
@@ -74,7 +75,7 @@ services:
 
 
   pictrs:
-    image: asonix/pictrs:0.3.0-beta.12-r1
+    image: asonix/pictrs:0.4.0-beta.19
     user: 991:991
     networks:
       - backend
diff --git a/entrypoint.sh b/entrypoint.sh
index f91ea3a..cb4154a 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -5,4 +5,4 @@ if [ ! -f /config/config.hjson ]; then
 fi
 
 # https://github.com/LemmyNet/lemmy/blob/main/docker/prod/Dockerfile
-/app/lemmy
+su lemmy -s /bin/sh -c /app/lemmy