Merge branch 'staging' into dev/Maddy/fix/listeningAfterDb

1 files changed, 20 insertions, 43 deletions

diff --git a/docker-compose.yml b/docker-compose.yml

index 13696f6f..8da4010c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,47 +1,24 @@
-version: '3.8'
+version: "3.9"
 
 services:
-  fosscord:
-    container_name: fosscord
-    image: fosscord
-    restart: on-failure:5
-    # depends_on: mariadb
-    build: .
-    ports:
-      - '3001-3005:3001-3005'
-    volumes:
-      # - ./data/:${WORK_DIR:-/srv/fosscord-server}/data/
-      - data:${WORK_DIR:-/srv/fosscord-server}/
-    environment:
-      WORK_DIR: ${WORK_DIR:-/srv/fosscord-server}
-      DEV_MODE: ${DEV_MODE:-0}
-      THREADS: ${THREADS:-1}
-      DATABASE: ${DATABASE:-../../data/database.db}
-      STORAGE_LOCATION: ${STORAGE_LOCATION:-../../data/files/}
-      HTTP_PORT: 3001
-      WS_PORT: 3002
-      CDN_PORT: 3003
-      RTC_PORT: 3004
-      ADMIN_PORT: 3005
-
-  # mariadb:
-  #   image: mariadb:latest
-  #   restart: on-failure:5
-  #   environment:
-  #     MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-secr3tpassw0rd}
-  #     MYSQL_DATABASE: ${MYSQL_DATABASE:-fosscord}
-  #     MYSQL_USER: ${MYSQL_USER:-fosscord}
-  #     MYSQL_PASSWORD: ${MYSQL_PASSWORD:-password1}
-  #   networks:
-  #     - default
-  #   volumes:
-  #     - mariadb:/var/lib/mysql
-
-volumes:
-  data:
-  # mariadb:
+    fosscord:
+        container_name: fosscord
+        image: fosscord
+        restart: on-failure:5
+        build: .
+        ports:
+            - "3001-3005:3001-3005"
+        volumes:
+            - ./:/srv/fosscord-server/
+        environment:
+            THREADS: ${THREADS:-1}
+            HTTP_PORT: 3001
+            WS_PORT: 3002
+            CDN_PORT: 3003
+            RTC_PORT: 3004
+            ADMIN_PORT: 3005
 
 networks:
-  default:
-    name: fosscord
-    driver: bridge
+    default:
+        name: fosscord
+        driver: bridge