From 6d340888f9a823aed2a04174e4a6a454446186ae Mon Sep 17 00:00:00 2001 From: Clifton Palmer Date: Sat, 19 Aug 2023 05:39:58 -0500 Subject: [PATCH 1/1] Updated with httpd alpine --- Dockerfile | 10 +++------- docker-compose.yml | 10 ++++------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index e9fbe23..0624f65 100644 --- 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 4484e2b..4fc3c44 100644 --- 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 -- 2.47.2