pacohope
/
docker-foswiki
mirror of https://github.com/timlegge/docker-foswiki.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

virtual hosts configs should be in /etc/nginx/http.d

pull/48/head v1.22
Timothy Legge 2022-01-05 23:48:15 -04:00
parent 07db7fedc8
commit 686f09a22d
No known key found for this signature in database
GPG Key ID: A82ECBFCEB02D695
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -138,10 +138,10 @@ RUN rm -rf /var/cache/apk/* && \
rm -fr /var/www/foswiki/working/configure/download/* && \
rm -fr /var/www/foswiki/working/configure/backup/* && \
mkdir -p /run/nginx && \
mkdir -p /etc/nginx/conf.d && \
mkdir -p /etc/nginx/http.d && \
chown -R nginx:nginx /var/www/foswiki
COPY nginx.default.conf /etc/nginx/conf.d/default.conf
COPY nginx.default.conf /etc/nginx/http.d/default.conf
COPY docker-entrypoint.sh docker-entrypoint.sh
COPY iwatch.xml /etc/iwatch.xml

2
docker-compose.2-simple-https.yml
View File

@ -18,7 +18,7 @@ services:
- solr_configsets:/opt/solr/server/solr/configsets:z
- solr_foswiki:/opt/solr/server/solr/solr_foswiki:z
- foswiki_www:/var/www/foswiki:z
- ./https/nginx.default.conf:/etc/nginx/conf.d/default.conf:z
- ./https/nginx.default.conf:/etc/nginx/http.d/default.conf:z
- ./https/docker-foswiki.crt:/etc/nginx/docker-foswiki.crt:z
- ./https/docker-foswiki.key:/etc/nginx/docker-foswiki.key:z