fix: reverted docker compose build approach

Steinbeck-Lab · Sep 30, 2024 · 9708ddd · 9708ddd
1 parent 667912a
commit 9708ddd
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
@@ -1,6 +1,11 @@
 services:
     app:
-        image: nfdi4chem/coconut:dev-app-latest
+        build:
+            context: .
+            dockerfile: ./resources/dc-ops/production/Dockerfile
+            args:
+                WWWGROUP: '${WWWGROUP}'
+        image: coconut-8.3/app
         container_name: coconut_app
         networks:
             - coconut
@@ -10,11 +15,15 @@ services:
             - cm
             # - typesense
         volumes:
-            - www-data:/var/www/html
+            - www-data:/var/www
     worker:
-        image: nfdi4chem/coconut:dev-app-latest
-        command: php artisan horizon
-        container_name: coconut_worker
+        build:
+            context: .
+            dockerfile: ./resources/dc-ops/production/Dockerfile
+            args:
+                WWWGROUP: '${WWWGROUP}'
+        image: coconut-8.3/app
+        container_name: coconut_app
         networks:
             - coconut
         depends_on:
@@ -23,7 +32,7 @@ services:
             - cm
             # - typesense
         volumes:
-            - www-data:/var/www/html
+            - www-data:/var/www
     pgsql:
         image: "informaticsmatters/rdkit-cartridge-debian:latest"
         ports:
@@ -77,7 +86,7 @@ services:
         depends_on:
             - app
         volumes:
-            - www-data:/var/www/html
+            - www-data:/var/www
     cm:
         image: "nfdi4chem/cheminformatics-microservice:dev-latest"
         environment:
@@ -91,7 +100,7 @@ services:
             retries: 20
             start_period: 60s
         networks:
-            - coconut
+            - sail
     # typesense:
     #     image: 'typesense/typesense:0.25.2'
     #     ports:

diff --git a/resources/dc-ops/nginx/default.conf b/resources/dc-ops/nginx/default.conf
@@ -3,7 +3,7 @@ server {
     index index.php index.html;
     error_log  /var/log/nginx/error.log;
     access_log /var/log/nginx/access.log;
-    root /var/www/html/public;
+    root /var/www/public;
     location ~ \.php$ {
         try_files $uri =404;
         fastcgi_split_path_info ^(.+\.php)(/.+)$;

diff --git a/resources/dc-ops/production/php.ini b/resources/dc-ops/production/php.ini
@@ -1,5 +1,5 @@
 [PHP]
-post_max_size = 100M
-upload_max_filesize = 100M
+post_max_size = 200M
+upload_max_filesize = 200M
 variables_order = EGPCS
 pcov.directory = .