From 0757f4796659f9fc17136b5d85bed7330653fab2 Mon Sep 17 00:00:00 2001
From: Robert Nasarek <r.nasarek@gnm.de>
Date: Mon, 10 Oct 2022 08:26:41 +0200
Subject: [PATCH] With adminer:fastcgi running

---
 docker-compose.yml    | 35 +++++------------------------
 nginx-conf/nginx.conf | 52 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 57 insertions(+), 30 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 004e64f..92bccb5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,10 +8,6 @@ services:
     env_file: .env
     volumes:
       - db-data:/var/lib/postgresql/data
-    ports:
-      - 3000:5432
-    networks:
-      - internal
 
   drupal:
       image: rnsrk/drupal:9.4.7-fpm-alpine-extended
@@ -21,9 +17,6 @@ services:
       depends_on:
         - postgres
       restart: unless-stopped
-      networks:
-        - internal
-        - external
       volumes:
         - drupal-data:/opt/drupal
         - ./drupal_context/custom-php-settings.ini:/usr/local/etc/php/conf.d/99-custom-settings.ini
@@ -39,48 +32,32 @@ services:
       volumes:
         - drupal-data:/opt/drupal
         - ./nginx-conf:/etc/nginx/conf.d
-      networks:
-        - external
+
   solr:
       image: solr:8-slim
       container_name: dlza_solr
-      restart: always
+      restart: unless-stopped
       volumes:
         - solr-data:/opt/solr
       environment:
         SOLR_JAVA_MEM: "-Xms256M -Xmx512M"
-      ports:
-        - 3002:8983
-      networks:
-        - external
+
   graphdb:
     image: rnsrk/graphdb:10.0.2
     container_name: dlza_graphdb
+    restart: unless-stopped
     build: 
       context: ./graphdb_context
     volumes:
       - graphdb-data:/graphdb/data
-    ports:
-      - 3003:7200
-    networks:
-      - external
 
   adminer:
     image: adminer:fastcgi
     container_name: dlza_adminer
-    restart: always
-    networks:
-      - internal
-      - external
-
-networks:
-  external:
-    driver: bridge
-  internal:
-    driver: bridge
+    restart: unless-stopped
 
 volumes:
   db-data:
   drupal-data:
   graphdb-data:
-  solr-data:
\ No newline at end of file
+  solr-data:
diff --git a/nginx-conf/nginx.conf b/nginx-conf/nginx.conf
index 1f78485..238d1f8 100644
--- a/nginx-conf/nginx.conf
+++ b/nginx-conf/nginx.conf
@@ -2,7 +2,25 @@ server {
     listen 80;
     listen [::]:80;
 
-    server_name dlza.gnm.de www.dlza.gnm.de;
+    server_name adminer.local;
+
+    index index.php; 
+
+    location ~ ^/(index.php)?$ {
+        fastcgi_index index.php;
+        include fastcgi_params;
+        fastcgi_param  SCRIPT_FILENAME /var/www/html/index.php;
+        fastcgi_param  DOCUMENT_ROOT   /var/www/html/;
+        fastcgi_pass adminer:9000;
+    }
+}
+
+
+server {
+    listen 80;
+    listen [::]:80;
+
+    server_name devel.local;
 
     index index.php index.html index.htm;
 
@@ -44,3 +62,35 @@ server {
         log_not_found off;
     }
 }
+
+server {
+    listen 80;
+    listen [::]:80;
+
+    server_name graphdb.local;
+
+    location / {
+        proxy_pass http://graphdb:7200;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+   
+}
+
+server {
+    listen 80;
+    listen [::]:80;
+
+    server_name solr.local;
+
+    location / {
+        proxy_pass http://solr:8983;
+        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+    }
+   
+}
+