Bump lemmy to 0.14.1

cadvisor.yml

@@ -0,0 +1,29 @@
+# 8010: cadvisor
+# 8015: prometheus
+
+version: '2.4'
+services:
+    # cadvisor
+    cadvisor:
+        image: google/cadvisor
+        restart: on-failure
+        ports:
+            - "127.0.0.1:8010:8080"
+        volumes:
+            - "/:/rootfs:ro"
+            - "/var/run:/var/run:rw"
+            - "/sys:/sys:ro"
+            - "/var/lib/docker/:/var/lib/docker:ro"
+            - "/dev/disk/:/dev/disk:ro"
+
+    # prometheus
+    prometheus:
+        image: prom/prometheus
+        restart: on-failure
+        links:
+            - cadvisor
+        ports:
+            - "127.0.0.1:8015:9090"
+        volumes:
+            - "./prometheus/config:/etc/prometheus"
+            - "./prometheus/data:/prometheus"

docker-compose.yml

@@ -8,49 +8,20 @@
 # 8007: phpmyadmin
 # 8008: matrix
 # 8009: mediagoblin
-# 8010: cadvisor
 # 8011: gitea
 # 8012: pleroma
 # 8013: peertube
 # 8014: parsoid
-# 8015: prometheus
 # 8016: woodpecker
 # 8017: lemmy
 # 8018: lemmy-ui
 # 8019: pictrs
 # 8020: iframely
+# 8021: adminer
+# 8022: webchat
 
 version: '2.4'
 services:
-    # matrix
-    matrix:
-        image: matrixdotorg/synapse:latest-py3
-#        image: matrixdotorg/synapse:v0.99.2-py3
-        restart: on-failure
-        volumes:
-            - ./matrix:/data
-        environment:
-            SYNAPSE_SERVER_NAME: matrix.monarch-pass.net
-            SYNAPSE_REPORT_STATS: "yes"
-            POSTGRES_DB: synapse
-            POSTGRES_HOST: postgres
-            POSTGRES_PASSWORD: ${SYNAPSE_POSTGRES_PASSWORD}
-            POSTGRES_USER: matrix
-        ports:
-             - "127.0.0.1:8008:8008"
-             - "8448:8448"
-        links:
-             - postgres
-
-    # openarena
-    openarena:
-        image: sago007/openarena
-        restart: on-failure
-        volumes:
-            - ./openarena:/data
-        ports:
-            - "27960:27960/udp"
-
     # malacoda.monarch-pass.net/wiki
     malacodapedia:
         #image: mediawiki
@@ -186,30 +157,6 @@ services:
           - DRONE_SERVER=woodpecker-server:9000
           - DRONE_SECRET=${DRONE_SECRET}
 
-    # glitchcity.info
-    glitchcity:
-        links:
-            - memcached:cache
-            - mariadb:db
-        ports:
-            - 127.0.0.1:8002:80
-        restart: on-failure
-        volumes:
-            - ./glitchcity.info/userdata:/userdata
-            - ./glitchcity.info/log:/var/log
-        build: https://forge.monarch-pass.net/glitch-city-laboratories/glitch-city-laboratories.git
-        environment:
-            GCL_DB_HOST: db
-            GCL_DB_NAME: glitchcity
-            GCL_DB_USER: glitchcity
-            GCL_DB_PASSWORD: ${GCL_DB_PASSWORD}
-            GCL_FORUMS_URL: //forums.glitchcity.info
-            GCL_WIKI_URL: //glitchcity.info/wiki
-            GCL_MEMCACHED_HOST: cache
-            GCL_SMTP_HOST: mail.gandi.net
-            GCL_SMTP_USER: no-reply@monarch-pass.net
-            GCL_SMTP_PASSWORD: ${GCL_SMTP_PASSWORD}
-
     # phpmyadmin
     phpmyadmin:
         image: phpmyadmin/phpmyadmin
@@ -221,31 +168,6 @@ services:
         environment:
             PMA_ABSOLUTE_URI: "https://phpmyadmin.monarch-pass.net/"
 
-    # cadvisor
-    cadvisor:
-        image: google/cadvisor
-        restart: on-failure
-        ports:
-            - "127.0.0.1:8010:8080"
-        volumes:
-            - "/:/rootfs:ro"
-            - "/var/run:/var/run:rw"
-            - "/sys:/sys:ro"
-            - "/var/lib/docker/:/var/lib/docker:ro"
-            - "/dev/disk/:/dev/disk:ro"
-
-    # prometheus
-    prometheus:
-        image: prom/prometheus
-        restart: on-failure
-        links:
-            - cadvisor
-        ports:
-            - "127.0.0.1:8015:9090"
-        volumes:
-            - "./prometheus/config:/etc/prometheus"
-            - "./prometheus/data:/prometheus"
-
     # parsoid
     parsoid:
         image: thenets/parsoid:0.10
@@ -282,25 +204,13 @@ services:
 
     # postgres
     postgres:
-        image: postgres:10
+        image: postgres:13
         restart: on-failure
         environment:
             POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
         volumes:
             - ./postgresql:/var/lib/postgresql/data
 
-    # minecraft
-    minecraft:
-        image: itzg/minecraft-server
-        restart: on-failure
-        ports:
-            - 25565:25565
-        environment:
-            VERSION: "1.12.2"
-            EULA: "TRUE"
-        volumes:
-            - ./minecraft:/data
-
     # irc
     irc:
         image: linuxserver/ngircd
@@ -319,7 +229,7 @@ services:
             - ./irc/discord:/config
 
     lemmy:
-        image: dessalines/lemmy:0.9.9
+        image: dessalines/lemmy:0.14.1
         ports:
             - "127.0.0.1:8017:8536"
         restart: always
@@ -333,7 +243,7 @@ services:
             - iframely
 
     lemmy-ui:
-        image: dessalines/lemmy-ui:0.9.9
+        image: dessalines/lemmy-ui:0.14.1
         ports:
             - "127.0.0.1:8018:1234"
         restart: always
@@ -362,3 +272,20 @@ services:
         restart: always
         mem_limit: 200m
 
+    adminer:
+        image: adminer:latest
+        ports:
+            - "127.0.0.1:8021:8080"
+        links:
+            - "mariadb:db"
+            - postgres
+            
+    webchat:
+        image: thelounge/thelounge:latest
+        ports:
+            - "127.0.0.1:8022:9000"
+        restart: always
+        volumes:
+            - ./irc/thelounge:/var/opt/thelounge
+        depends_on:
+            - irc

games.yml

@@ -0,0 +1,22 @@
+version: '2.4'
+services:
+    # openarena
+    openarena:
+        image: sago007/openarena
+        restart: on-failure
+        volumes:
+            - ./openarena:/data
+        ports:
+            - "27960:27960/udp"
+
+    # minecraft
+    minecraft:
+        image: itzg/minecraft-server
+        restart: on-failure
+        ports:
+            - 25565:25565
+        environment:
+            VERSION: "1.12.2"
+            EULA: "TRUE"
+        volumes:
+            - ./minecraft:/data