Service now runs on existing proxy network.

diff --git a/Dockerfile b/Dockerfile
index a92ef5c80c601ae42abfe1af666f5d5b03d1188b..e9fbe232ceb8eb0464f9880cc162c4b67191e9d6 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,5 @@ RUN apt-get update -y && \
     apt-get -y install make gcc perl && \
     cpan -i File::Spec File::Path
 
     apt-get -y install make gcc perl && \
     cpan -i File::Spec File::Path
 

-RUN mkdir -p /usr/local/apache2/htdocs/public
-

 ADD /httpd.conf /usr/local/apache2/conf/httpd.conf
 ADD /public /root/public
 ADD /httpd.conf /usr/local/apache2/conf/httpd.conf
 ADD /public /root/public

diff --git a/docker-compose.yml b/docker-compose.yml
index 4f13b0a3b61c7227589e138b7169a5a864779112..00655cad78318a1fc457a7d3332f665d65956bc9 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,13 +1,17 @@
 version: '3'
 version: '3'

+networks:
+    default:
+        external:
+            name: proxy

 services:
 services:

-    app:
+    web:

         build: .
         image: cliftonpalmer/public
         volumes:
         build: .
         image: cliftonpalmer/public
         volumes:

-            - ${LOCAL_STORAGE}:/storage
+        - ${LOCAL_STORAGE}:/storage

         environment:
         environment:

-            - PUBLIC_ROOT_DIR=/storage/Art/art by me
-            - PUBLIC_LINK_DIR=/usr/local/apache2/htdocs/public
-            - PUBLIC_HTTP_URI=http://${IPV4_WAN}/public
+        - PUBLIC_ROOT_DIR=/storage/Art/art by me
+        - PUBLIC_LINK_DIR=/usr/local/apache2/htdocs
+        - PUBLIC_HTTP_URI=http://${IPV4_WAN}

         ports:
         ports:

-            - 80:80
+        - 80:80