Updated with httpd alpine

diff --git a/Dockerfile b/Dockerfile
index e9fbe232ceb8eb0464f9880cc162c4b67191e9d6..0624f6501230e7fb15dbbb200c07af063bc5e260 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,4 @@
-FROM httpd:2.4
+FROM httpd:2.4-alpine
 
-RUN apt-get update -y && \
-    apt-get -y install make gcc perl && \
-    cpan -i File::Spec File::Path
-
-ADD /httpd.conf /usr/local/apache2/conf/httpd.conf
-ADD /public /root/public
+COPY /httpd.conf /usr/local/apache2/conf/httpd.conf
+COPY /public /root/public

diff --git a/docker-compose.yml b/docker-compose.yml
index 4484e2bd0b99fe96c4514ee1e0974edf4a959f1c..4fc3c44dbe7c7c41501e3488f259494c4d9ff33b 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,19 +1,17 @@
 version: '3'
-networks:
-    default:
-        external:
-            name: proxy
 services:
     web:
         build: .
-        image: cliftonpalmer/public:1.0.0
+        image: cjpalmer/public:1.1.0
         volumes:
         - ${LOCAL_STORAGE}:/storage
         - public_data:/usr/local/apache2/htdocs
         environment:
         - PUBLIC_ROOT_DIR=/storage
         - PUBLIC_LINK_DIR=/usr/local/apache2/htdocs
-        - PUBLIC_HTTP_URI=http://${IPV4_WAN}
+        - PUBLIC_HTTP_URI=https://${IPV4_WAN}
+        ports:
+        - 80:80
 volumes:
     public_data:
         driver: local