From cd191e933618cd8d64828714abd756a19f4224e2 Mon Sep 17 00:00:00 2001 From: stam Date: Wed, 15 Jan 2020 11:57:01 +0300 Subject: [PATCH] dhparam.pem moved to base image and symlinked to target folders in child images --- balancer/latest/Dockerfile | 2 +- epicmorg/prod/main/Dockerfile | 3 ++- websites/latest/Dockerfile | 2 +- websites/php7.2/Dockerfile | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/balancer/latest/Dockerfile b/balancer/latest/Dockerfile index 1def92759..6bd24a6d7 100644 --- a/balancer/latest/Dockerfile +++ b/balancer/latest/Dockerfile @@ -179,7 +179,7 @@ RUN apt-get update && \ ln -s /usr/local/lib/libIP2Location.so.1 /lib/libIP2Location.so.1 && \ ln -sf /dev/stdout /var/log/nginx/access.log && \ ln -sf /dev/stderr /var/log/nginx/error.log && \ - openssl dhparam -out /etc/nginx/dhparam.pem 4096 && \ + ln -sf /etc/ssl/dhparam.pem /etc/nginx/dhparam.pem && \ apt clean -y && \ apt autoclean -y && \ diff --git a/epicmorg/prod/main/Dockerfile b/epicmorg/prod/main/Dockerfile index e472cfb5e..e41d7f189 100644 --- a/epicmorg/prod/main/Dockerfile +++ b/epicmorg/prod/main/Dockerfile @@ -58,7 +58,8 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio util-linux \ uuid-runtime \ wget \ - zip + zip && \ + openssl dhparam -out /etc/ssl/dhparam.pem 4096 ################################################################## # cleaninig up diff --git a/websites/latest/Dockerfile b/websites/latest/Dockerfile index 369230aa0..5259091cd 100644 --- a/websites/latest/Dockerfile +++ b/websites/latest/Dockerfile @@ -124,7 +124,7 @@ RUN apt-get update && \ dav \ dav_fs \ alias && \ - openssl dhparam -out /etc/apache2/dhparam.pem 4096 && \ + ln -sf /etc/ssl/dhparam.pem /etc/apache2/dhparam.pem && \ php -v ################################################################## diff --git a/websites/php7.2/Dockerfile b/websites/php7.2/Dockerfile index 069933ada..61d2bc8b7 100644 --- a/websites/php7.2/Dockerfile +++ b/websites/php7.2/Dockerfile @@ -80,7 +80,7 @@ RUN apt-get update && \ dav \ dav_fs \ alias && \ - openssl dhparam -out /etc/apache2/dhparam.pem 4096 && \ + ln -sf /etc/ssl/dhparam.pem /etc/apache2/dhparam.pem && \ php -v ##################################################################