diff --git a/Dockerfile b/Dockerfile index f8f6b9d8..c368f6e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,6 +33,8 @@ RUN set -e -x \ openssl-dev \ perl-dev \ perl-utils \ + perl-net-ssleay \ + perl-io-socket-ssl \ php81-pdo \ php81-pdo_mysql \ php81-pdo_pgsql \ @@ -43,7 +45,7 @@ RUN set -e -x \ && unzip parser.zip && cp -av dmarcts-report-parser-master/* /usr/bin/ && rm -vf parser.zip && rm -rvf dmarcts-report-parser-master \ && unzip viewer.zip && cp -av dmarcts-report-viewer-master/* /var/www/viewer/ && rm -vf viewer.zip && rm -rvf dmarcts-report-viewer-master \ && sed -i "1s/^/body { font-family: Sans-Serif; }\n/" /var/www/viewer/default.css \ - && sed -i 's%.*listen [::]:8080 default_server;% listen [::]:80 default_server;%g' /etc/nginx/nginx.conf \ + && sed -i 's%^\s*listen \[::\]:8080 default_server;% listen [::]:80 default_server;%g' /etc/nginx/nginx.conf \ && sed -i 's%.*listen 8080 default_server;% listen 80 default_server;%g' /etc/nginx/nginx.conf \ && sed -i 's%.*root /var/www/html;% root /var/www/viewer;%g' /etc/nginx/nginx.conf \ && sed -i 's/.*index index.php index.html;/ index dmarcts-report-viewer.php;/g' /etc/nginx/nginx.conf \ @@ -74,7 +76,7 @@ RUN set -e -x \ Socket6 \ PerlIO::gzip \ ; do cpan install $i; done \ - && apk del mariadb-dev expat-dev openssl-dev perl-dev g++ cmake make musl-obstack-dev libpq-dev + && apk del mariadb-dev openssl-dev perl-dev g++ cmake make musl-obstack-dev libpq-dev HEALTHCHECK --interval=1m --timeout=3s CMD curl --silent --fail http://127.0.0.1:80/fpm-ping diff --git a/examples/env.example b/examples/env.example index e014b8f0..4df73850 100644 --- a/examples/env.example +++ b/examples/env.example @@ -51,3 +51,6 @@ PARSER_IMAP_IGNORE_ERROR=0 # When the size exceeds the maximum, one could experience an error Uncaught ValueError: DOMDocument::loadXML(): # Argument #1 ($source) must not be empty. PARSER_XML_MAXSIZE=50000 + +# Disable nginx ipv6 functionality. Set to 1 to activate +NO_NGINX_IPV6=0 diff --git a/manifest/entrypoint.sh b/manifest/entrypoint.sh index 32569614..5af44465 100755 --- a/manifest/entrypoint.sh +++ b/manifest/entrypoint.sh @@ -40,5 +40,11 @@ else exit 1 fi +if [[ -v NO_NGINX_IPV6 ]]; then + nginx -s stop + sed -i 's/^\([[:space:]]*\)listen \[::\]:80 default_server;/\1#listen [::]:80 default_server;/g' /etc/nginx/nginx.conf + nginx +fi + # Start supervisord and services /usr/bin/supervisord -n -c /etc/supervisord.conf