From 442da7b13669c177b82eee4cc6eb04dbbda7c23a Mon Sep 17 00:00:00 2001 From: faulty Date: Wed, 15 Feb 2023 16:06:09 +0100 Subject: [PATCH] change things --- custom/proxy/90-copy-files.sh | 4 ++++ custom/proxy/Dockerfile | 9 ++++++--- docker-compose.base.yml | 4 ++++ 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 custom/proxy/90-copy-files.sh diff --git a/custom/proxy/90-copy-files.sh b/custom/proxy/90-copy-files.sh new file mode 100644 index 0000000..166e8d5 --- /dev/null +++ b/custom/proxy/90-copy-files.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +cp -r /custom/vhost.d/* /etc/nginx/vhost.d +cp -r /custom/conf.d/* /etc/nginx/conf.d \ No newline at end of file diff --git a/custom/proxy/Dockerfile b/custom/proxy/Dockerfile index 2d6e956..e4d5cef 100644 --- a/custom/proxy/Dockerfile +++ b/custom/proxy/Dockerfile @@ -1,5 +1,8 @@ FROM nginxproxy/nginx-proxy:latest -COPY config/vhost.d/* /etc/nginx/vhost.d/ -COPY config/conf.d/* /etc/nginx/conf.d/ -COPY config/nginx.conf /etc/nginx/nginx.conf \ No newline at end of file +COPY config/nginx.conf /etc/nginx/nginx.conf + +COPY 90-copy-files.sh /docker-entrypoint.d + +COPY config/vhost.d /custom/vhost.d +COPY config/conf.d /custom/conf.d \ No newline at end of file diff --git a/docker-compose.base.yml b/docker-compose.base.yml index b49e36d..1d1b074 100644 --- a/docker-compose.base.yml +++ b/docker-compose.base.yml @@ -17,6 +17,8 @@ services: - 443:443 volumes: - /srv/.webcerts:/etc/nginx/certs:rw + - /srv/proxy/config/conf.d:/etc/nginx/conf.d + - /srv/proxy/other/vhost.d:/etc/nginx/vhost.d - /srv/proxy/data/html:/usr/share/nginx/html - /var/run/docker.sock:/tmp/docker.sock labels: @@ -32,6 +34,8 @@ services: - proxy volumes: - /srv/.webcerts:/etc/nginx/certs:rw + - /srv/proxy/config/conf.d:/etc/nginx/conf.d + - /srv/proxy/other/vhost.d:/etc/nginx/vhost.d - /srv/proxy/data/html:/usr/share/nginx/html - /var/run/docker.sock:/var/run/docker.sock:ro environment: