maj docker-compose

dockers/mattermost/docker-compose.yml

@@ -1,21 +1,15 @@
 services:
 
   app:
-    image: mattermost/mattermost-team-edition:9.10
+    image: mattermost/mattermost-team-edition:10.4
     container_name: ${mattermostServName}
     restart: ${restartPolicy}
-    # memory: 1G
-    # disk_quota: 256M
     volumes:
       - matterConfig:/mattermost/config:rw
-#      - matterConfigLangSrv:/mattermost/i18n:rw
-#      - matterConfigLangClt:/mattermost/client/i18n:rw      
       - matterData:/mattermost/data:rw
       - matterLogs:/mattermost/logs:rw
       - matterPlugins:/mattermost/plugins:rw
       - matterClientPlugins:/mattermost/client/plugins:rw
-#      - matterIcons:/mattermost/client/images/
-#      - matterI18n:/mattermost/i18n:rw
       - /etc/ssl:/etc/ssl:ro
       - /etc/localtime:/etc/localtime:ro
       - /etc/timezone:/etc/timezone:ro
@@ -29,17 +23,12 @@ services:
       - MM_PASSWORDSETTINGS_UPPERCASE=false
       - MM_PASSWORDSETTINGS_NUMBER=false
       - MM_PASSWORDSETTINGS_SYMBOL=true
-      # in case your config is not in default location
-      #- MM_CONFIG=/mattermost/config/config.json
-
     depends_on:
-      - db
+      - postgres
     links:
-      - db
+      - postgres
     expose:
       - ${matterPort}
-    # ports:
-    #   - 8089:80
     networks:
       - mattermostNet
       - postfixNet
@@ -57,22 +46,30 @@ services:
       start_period: 20s
       timeout: 10s
 
-  db:
+  postgres:
-    image: mariadb:10.5
+    image: postgres:17-alpine
-    container_name: ${mattermostDBName}
+    container_name: matterPG
     restart: ${restartPolicy}
     networks:
       - mattermostNet
+    security_opt:
+      - no-new-privileges:true
+    pids_limit: 100
+    read_only: true
+    tmpfs:
+      - /tmp
+      - /var/run/postgresql
+    volumes:
+      - matterPG:/var/lib/postgresql/data
+#    environment:
+      # timezone inside container
+      # - TZ
     env_file:
       - ../../secret/env-${mattermostDBName}
-    volumes:
+
-      - matterDB:/var/lib/mysql
-      - /home/sauve/:/svg/
-      - /etc/localtime:/etc/localtime:ro
-      - /etc/timezone:/etc/timezone:ro
 
 volumes:
-  matterDB:
+  matterPG:
   matterConfig:
   matterData:
   matterLogs:
@@ -80,8 +77,6 @@ volumes:
   matterClientPlugins:
   matterConfigLangSrv:
   matterConfigLangClt:
-#  matterI18n:
-#  matterIcons:
 
 networks:
   mattermostNet:

dockers/portainer/docker-compose.yml

@@ -16,8 +16,8 @@ services:
       - "traefik.enable=true"
       
       # Frontend      
+      - "traefik.http.routers.frontend.middlewares=test-adminipallowlist@file"
       - "traefik.http.routers.frontend.rule=Host(`portainer.${domain}`)"
-#      - "traefik.docker.network=portainerNet"      
       - "traefik.http.routers.frontend.entrypoints=websecure"
       - "traefik.http.services.frontend.loadbalancer.server.port=9000"
       - "traefik.http.routers.frontend.service=frontend"