Cleaned up project and removed httpd

[go.git] / docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index c80c306239380e7f05fd3d7b4d475d97c2e44116..e83c64004d2e6bbaeafeb9fcb857026b602aff8a 100644 (file)
--- 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