From 5d905aba107df6daa246e084bfc00d6be5b70ccf Mon Sep 17 00:00:00 2001
From: Clifton Palmer <clifton.james.palmer@protonmail.com>
Date: Tue, 10 Oct 2023 04:54:42 -0500
Subject: [PATCH] Cleaned up project and removed httpd

* Removed junk compose file
* Updated compose file
* Removed httpd
* Added inital socket image version
* Made nginx host into its own image
* Added backend network for db
---
 docker-compose-prod.yml           | 26 --------------------------
 docker-compose.yml                | 28 ++++++++++++----------------
 web/Dockerfile                    |  4 ++++
 nginx.conf => web/nginx.conf      |  5 +++--
 {htdocs => web/static}/go.js      |  0
 {htdocs => web/static}/index.html |  0
 6 files changed, 19 insertions(+), 44 deletions(-)
 delete mode 100644 docker-compose-prod.yml
 create mode 100644 web/Dockerfile
 rename nginx.conf => web/nginx.conf (85%)
 rename {htdocs => web/static}/go.js (100%)
 rename {htdocs => web/static}/index.html (100%)

diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
deleted file mode 100644
index a3d1860..0000000
--- a/docker-compose-prod.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-version: '3'
-networks:
-    frontend:
-        external:
-            name: proxy
-services:
-    db:
-        image: mariadb:10.6
-        environment:
-            MARIADB_ROOT_PASSWORD: admin
-            MARIADB_DATABASE: go
-            MARIADB_USER: socket
-            MARIADB_PASSWORD: socketpw
-    socket:
-        build: ./socket
-        image: cliftonpalmer/go-socket
-        networks:
-        - default
-        - frontend
-    httpd:
-        image: httpd:2.4
-        volumes:
-        - ./htdocs:/usr/local/apache2/htdocs
-        networks:
-        - default
-        - frontend
diff --git a/docker-compose.yml b/docker-compose.yml
index c80c306..e83c640 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,7 @@
 version: '3'
+networks:
+    go-backend:
+        driver: bridge
 services:
     db:
         image: mariadb:10.6
@@ -7,26 +10,19 @@ services:
             MARIADB_DATABASE: go
             MARIADB_USER: socket
             MARIADB_PASSWORD: socketpw
+        networks:
+        - go-backend
     socket:
         build: ./socket
-        image: cliftonpalmer/go-socket
-    httpd:
-        image: httpd:2.4
-        volumes:
-        - ./htdocs:/usr/local/apache2/htdocs
+        image: cjpalmer/go-socket:1.0.0
+        networks:
+        - default
+        - go-backend
     web:
-        image: nginx:1.17
-        restart: on-failure
-        deploy:
-            restart_policy:
-                condition: on-failure
-                delay: 5s
-                max_attempts: 5
-                window: 10s
-        volumes:
-        - ./nginx.conf:/etc/nginx/nginx.conf
+        build: ./web
+        image: cjpalmer/go-web:1.0.0
         environment:
         - NGINX_HOST=purplebirdman.com
         - NGINX_PORT=80
         ports:
-        - 8000:80
+        - 80:80
diff --git a/web/Dockerfile b/web/Dockerfile
new file mode 100644
index 0000000..40d7e88
--- /dev/null
+++ b/web/Dockerfile
@@ -0,0 +1,4 @@
+FROM nginx:1.17
+
+COPY ./nginx.conf /etc/nginx/nginx.conf
+COPY ./static/    /www/data/
diff --git a/nginx.conf b/web/nginx.conf
similarity index 85%
rename from nginx.conf
rename to web/nginx.conf
index f27608f..5a4a15e 100644
--- a/nginx.conf
+++ b/web/nginx.conf
@@ -7,10 +7,11 @@ events {
 http {
     server {
         server_name go.purplebirdman.com;
+
         location / {
-            proxy_pass http://httpd;
-            proxy_set_header Host $host;
+            root /www/data;
         }
+
         location /ws {
             proxy_pass http://socket:3000;
             # websocket magic
diff --git a/htdocs/go.js b/web/static/go.js
similarity index 100%
rename from htdocs/go.js
rename to web/static/go.js
diff --git a/htdocs/index.html b/web/static/index.html
similarity index 100%
rename from htdocs/index.html
rename to web/static/index.html
-- 
2.47.2