Updated docker images

roseckyj · Oct 25, 2024 · f41158f · f41158f
1 parent 58ceaa3
commit f41158f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/.github/workflows/build_images.yml b/.github/workflows/build_images.yml
@@ -24,6 +24,9 @@ jobs:
                     - dockerfile: ./web/Dockerfile
                       image: ghcr.io/roseckyj/terratinker_web
                       context: ./web
+                    - dockerfile: ./manager/Dockerfile
+                      image: ghcr.io/roseckyj/terratinker_manager
+                      context: ./manager
         permissions:
             contents: read
             packages: write

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
@@ -11,10 +11,10 @@ services:
         environment:
             - EULA=${EULA:-false}
         volumes:
-            - fileUpload:/app/plugins/TerraTinker
+            - fileUpload:/app/server/plugins/TerraTinker
         deploy:
             mode: replicated
-            replicas: 3
+            replicas: 4
 
     manager:
         image: ghcr.io/roseckyj/terratinker_manager:latest
@@ -26,6 +26,8 @@ services:
         environment:
             - PORT=8080
             - SERVER_URL=server:7070
+        volumes:
+            - fileUpload:/app/uploads
 
     web:
         image: ghcr.io/roseckyj/terratinker_web:latest
@@ -34,12 +36,12 @@ services:
         networks:
             default:
         restart: always
-        labels: 
+        labels:
             - "traefik.http.routers.terratinker.rule=Host(`terratinker.xrosecky.cz`) || Host(`terratinker.fi.muni.cz`)"
             - "traefik.http.routers.terratinker.tls=true"
             - "traefik.http.routers.terratinker.tls.certresolver=lets-encrypt"
             - "traefik.http.services.terratinker.loadbalancer.server.port=${PORT:-80}"
 
 volumes:
     fileUpload:
-        driver: local
+        driver: local
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -11,10 +11,10 @@ services:
         environment:
             - EULA=${EULA:-false}
         volumes:
-            - fileUpload:/app/plugins/TerraTinker
+            - fileUpload:/app/server/plugins/TerraTinker
         deploy:
             mode: replicated
-            replicas: 3
+            replicas: 4
 
     manager:
         image: ghcr.io/roseckyj/terratinker_manager:latest
@@ -26,6 +26,8 @@ services:
         environment:
             - PORT=8080
             - SERVER_URL=server:7070
+        volumes:
+            - fileUpload:/app/uploads
 
     web:
         image: ghcr.io/roseckyj/terratinker_web:latest
@@ -37,4 +39,4 @@ services:
 
 volumes:
     fileUpload:
-        driver: local
+        driver: local