From 9a716f7303ad44c22744cf003aac5d384ed2c838 Mon Sep 17 00:00:00 2001
From: knoflook <knoflook@disroot.org>
Date: Tue, 6 Jun 2023 15:35:52 +0200
Subject: [PATCH] 0.1.0 rc, still testing that one

---
 .env.sample                                   | 12 ----
 abra.sh                                       |  1 +
 compose.yml                                   | 65 +++++++------------
 ...-mattermost-entrypoint.sh => entrypoint.sh |  0
 4 files changed, 26 insertions(+), 52 deletions(-)
 create mode 100644 abra.sh
 rename abra-mattermost-entrypoint.sh => entrypoint.sh (100%)

diff --git a/.env.sample b/.env.sample
index c93605e..1a692c2 100644
--- a/.env.sample
+++ b/.env.sample
@@ -14,15 +14,3 @@ SECRET_POSTGRES_PASSWORD_VERSION=v1
 ## A list of these tz database names can be looked up at Wikipedia
 ## https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 TZ=UTC
-
-## Make Mattermost container readonly. This interferes with the regeneration of root.html inside the container. Only use
-## it if you know what you're doing.
-## See https://github.com/mattermost/docker/issues/18
-MATTERMOST_CONTAINER_READONLY=false
-
-## Additional configuration settings for Mattermost. Documentation on the variables and the settings itself can be found at
-## https://docs.mattermost.com/administration/config-settings.html
-## Keep in mind that variables set here will take precedence over the same setting in config.json. This includes
-## the system console as well and settings set with env variables will be greyed out.
-
-
diff --git a/abra.sh b/abra.sh
new file mode 100644
index 0000000..e6c130b
--- /dev/null
+++ b/abra.sh
@@ -0,0 +1 @@
+export ENTRYPOINT_VERSION=v1
diff --git a/compose.yml b/compose.yml
index b6a5e70..16ff881 100644
--- a/compose.yml
+++ b/compose.yml
@@ -1,50 +1,19 @@
 version: "3.8"
 
 services:
-  postgres:
-    image: postgres:13-alpine
-    security_opt:
-      - no-new-privileges:true
-    tmpfs:
-      - /tmp
-      - /var/run/postgresql
-    volumes:
-      - postgres_data:/var/lib/postgresql/data
-    environment:
-      # timezone inside container
-      - TZ
-
-      # necessary Postgres options/variables
-      - POSTGRES_USER=mattermost
-      - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
-      - POSTGRES_DB=mattermost
-    secrets:
-      - postgres_password
-    networks:
-      - internal
-
   app:
-    image: mattermost/mattermost-team-edition:5.39
-    security_opt:
-      - no-new-privileges:true
-    read_only: ${MATTERMOST_CONTAINER_READONLY}
-    tmpfs:
-      - /tmp
+    image: mattermost/mattermost-team-edition:7.9.4
+    environment:
+      - TZ
+      - MM_SQLSETTINGS_DRIVERNAME=postgres
+      - MM_SERVICESETTINGS_SITEURL=https://${DOMAIN}
     volumes:
       - mattermost_config:/mattermost/config:rw
       - mattermost_data:/mattermost/data:rw
       - mattermost_logs:/mattermost/logs:rw
       - mattermost_plugins:/mattermost/plugins:rw
       - mattermost_client_plugins:/mattermost/client/plugins:rw
-    environment:
-      # timezone inside container
-      - TZ
-
-      # necessary Mattermost options/variables (see env.sample)
-      - MM_SQLSETTINGS_DRIVERNAME=postgres
-
-      # additional settings
-      - MM_SERVICESETTINGS_SITEURL=https://${DOMAIN}
+      - mattermost_certs:/etc/ssl/certs:ro
     networks:
       - proxy
       - internal
@@ -59,6 +28,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
         - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
         - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
+        - "coop-cloud.${STACK_NAME}.version=0.1.0+7.9.4"
     configs:
       - source: abra_mattermost_entrypoint
         target: /abra-mattermost-entrypoint.sh
@@ -67,6 +37,21 @@ services:
       - postgres_password
     entrypoint: /abra-mattermost-entrypoint.sh
 
+  postgres:
+    image: postgres:15-alpine
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    environment:
+      - TZ
+      - POSTGRES_USER=mattermost
+      - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
+      - POSTGRES_DB=mattermost
+    secrets:
+      - postgres_password
+    networks:
+      - internal
+
+
 secrets:
   postgres_password:
     external: true
@@ -74,8 +59,8 @@ secrets:
 
 configs:
   abra_mattermost_entrypoint:
-    name: abra_mattermost_entrypoint
-    file: ./abra-mattermost-entrypoint.sh
+    name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION}
+    file: ./entrypoint.sh
 
 networks:
   proxy:
@@ -85,8 +70,8 @@ networks:
 volumes:
   postgres_data:
   mattermost_config:
+  mattermost_certs:
   mattermost_data:
   mattermost_logs:
   mattermost_plugins:
   mattermost_client_plugins:
-
diff --git a/abra-mattermost-entrypoint.sh b/entrypoint.sh
similarity index 100%
rename from abra-mattermost-entrypoint.sh
rename to entrypoint.sh