From 7ba34b2f79ceba12c403b3e716a68a5bc05ed517 Mon Sep 17 00:00:00 2001
From: George Vlahavas <vlahavas@gmail.com>
Date: Fri, 26 Mar 2021 02:22:26 +0200
Subject: [PATCH] Build our own webserver image

Include the nginx configuration inside the docker container. We're
saving up on one mounted volume like this.
---
 api/nginx/conf.d/api.conf | 22 ----------------------
 docker-compose-jfrog.yml  |  3 +--
 docker-compose.yml        |  4 ++--
 webserver/Dockerfile      |  3 +++
 webserver/api.conf        | 22 ++++++++++++++++++++++
 5 files changed, 28 insertions(+), 26 deletions(-)
 delete mode 100644 api/nginx/conf.d/api.conf
 create mode 100644 webserver/Dockerfile
 create mode 100644 webserver/api.conf

diff --git a/api/nginx/conf.d/api.conf b/api/nginx/conf.d/api.conf
deleted file mode 100644
index 4be31fa..0000000
--- a/api/nginx/conf.d/api.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-server {
-    listen 80;
-    index index.php index.html;
-    error_log  /var/log/nginx/error.log;
-    access_log /var/log/nginx/access.log;
-    root /var/www/public;
-
-    location ~ \.php$ {
-        try_files $uri =404;
-        fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass api:9000;
-        fastcgi_index index.php;
-        include fastcgi_params;
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-        fastcgi_param PATH_INFO $fastcgi_path_info;
-    }
-
-    location / {
-        try_files $uri $uri/ /index.php?$query_string;
-        gzip_static on;
-    }
-}
diff --git a/docker-compose-jfrog.yml b/docker-compose-jfrog.yml
index d9e4c6a..dbaaf05 100644
--- a/docker-compose-jfrog.yml
+++ b/docker-compose-jfrog.yml
@@ -59,7 +59,7 @@ services:
 
   #Controller      
   webserver:
-    image: registry.curex-project.eu:443/curex-local/kea_webserver:1.19
+    image: registry.curex-project.eu:443/curex-local/kea_webserver:1.0.0
     container_name: kea_webserver
     restart: unless-stopped
     depends_on:
@@ -70,7 +70,6 @@ services:
       - "443:443"
     volumes:
       - ./api:/var/www
-      - ./api/nginx/conf.d/:/etc/nginx/conf.d/
   
   api:
     image: registry.curex-project.eu:443/curex-local/kea_api:1.0.1
diff --git a/docker-compose.yml b/docker-compose.yml
index 0040d1b..2d0fd59 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -65,7 +65,8 @@ services:
       
   #Controller      
   webserver:
-    image: nginx:1.19-alpine
+    build:
+      context: ./webserver
     container_name: curex-webserver
     restart: unless-stopped
     tty: true
@@ -74,7 +75,6 @@ services:
       - "443:443"
     volumes:
       - ./api:/var/www
-      - ./api/nginx/conf.d/:/etc/nginx/conf.d/
   
   composer:
     restart: 'no'
diff --git a/webserver/Dockerfile b/webserver/Dockerfile
new file mode 100644
index 0000000..5900c5f
--- /dev/null
+++ b/webserver/Dockerfile
@@ -0,0 +1,3 @@
+FROM nginx:1.19-alpine
+COPY api.conf /etc/nginx/conf.d/default.conf
+
diff --git a/webserver/api.conf b/webserver/api.conf
new file mode 100644
index 0000000..4be31fa
--- /dev/null
+++ b/webserver/api.conf
@@ -0,0 +1,22 @@
+server {
+    listen 80;
+    index index.php index.html;
+    error_log  /var/log/nginx/error.log;
+    access_log /var/log/nginx/access.log;
+    root /var/www/public;
+
+    location ~ \.php$ {
+        try_files $uri =404;
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
+        fastcgi_pass api:9000;
+        fastcgi_index index.php;
+        include fastcgi_params;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_param PATH_INFO $fastcgi_path_info;
+    }
+
+    location / {
+        try_files $uri $uri/ /index.php?$query_string;
+        gzip_static on;
+    }
+}
-- 
2.2.2