From e6ff5067f92e4b2f3d7bd7cb0ddee72c079ddf21 Mon Sep 17 00:00:00 2001 From: "P." Date: Wed, 19 Feb 2025 11:34:29 -0600 Subject: [PATCH] dockerfile: fix openssl passin/passout reference --- simplerisk/generate_dockerfile.sh | 4 ++-- simplerisk/jammy/Dockerfile | 4 ++-- simplerisk/noble/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/simplerisk/generate_dockerfile.sh b/simplerisk/generate_dockerfile.sh index 334f189..ab6e29c 100755 --- a/simplerisk/generate_dockerfile.sh +++ b/simplerisk/generate_dockerfile.sh @@ -89,8 +89,8 @@ RUN sed -i 's/\\(upload_max_filesize =\\) .*\\(M\\)/\\1 5\\2/g' /etc/php/$php_ve # Create SSL Certificates for Apache SSL RUN mkdir -p /etc/apache2/ssl/ssl.crt /etc/apache2/ssl/ssl.key && \\ - openssl genrsa -des3 -passout pass:/passwords/pass_openssl.txt -out /etc/apache2/ssl/ssl.key/simplerisk.pass.key && \\ - openssl rsa -passin pass:/passwords/pass_openssl.txt -in /etc/apache2/ssl/ssl.key/simplerisk.pass.key -out /etc/apache2/ssl/ssl.key/simplerisk.key && \\ + openssl genrsa -des3 -passout file:/passwords/pass_openssl.txt -out /etc/apache2/ssl/ssl.key/simplerisk.pass.key && \\ + openssl rsa -passin file:/passwords/pass_openssl.txt -in /etc/apache2/ssl/ssl.key/simplerisk.pass.key -out /etc/apache2/ssl/ssl.key/simplerisk.key && \\ rm /etc/apache2/ssl/ssl.key/simplerisk.pass.key && \\ openssl req -new -key /etc/apache2/ssl/ssl.key/simplerisk.key -out /etc/apache2/ssl/ssl.crt/simplerisk.csr -subj "/CN=simplerisk" && \\ openssl x509 -req -days 365 -in /etc/apache2/ssl/ssl.crt/simplerisk.csr -signkey /etc/apache2/ssl/ssl.key/simplerisk.key -out /etc/apache2/ssl/ssl.crt/simplerisk.crt diff --git a/simplerisk/jammy/Dockerfile b/simplerisk/jammy/Dockerfile index f65d2df..4f79b3a 100644 --- a/simplerisk/jammy/Dockerfile +++ b/simplerisk/jammy/Dockerfile @@ -63,8 +63,8 @@ RUN sed -i 's/\(upload_max_filesize =\) .*\(M\)/\1 5\2/g' /etc/php/8.1/apache2/p # Create SSL Certificates for Apache SSL RUN mkdir -p /etc/apache2/ssl/ssl.crt /etc/apache2/ssl/ssl.key && \ - openssl genrsa -des3 -passout pass:/passwords/pass_openssl.txt -out /etc/apache2/ssl/ssl.key/simplerisk.pass.key && \ - openssl rsa -passin pass:/passwords/pass_openssl.txt -in /etc/apache2/ssl/ssl.key/simplerisk.pass.key -out /etc/apache2/ssl/ssl.key/simplerisk.key && \ + openssl genrsa -des3 -passout file:/passwords/pass_openssl.txt -out /etc/apache2/ssl/ssl.key/simplerisk.pass.key && \ + openssl rsa -passin file:/passwords/pass_openssl.txt -in /etc/apache2/ssl/ssl.key/simplerisk.pass.key -out /etc/apache2/ssl/ssl.key/simplerisk.key && \ rm /etc/apache2/ssl/ssl.key/simplerisk.pass.key && \ openssl req -new -key /etc/apache2/ssl/ssl.key/simplerisk.key -out /etc/apache2/ssl/ssl.crt/simplerisk.csr -subj "/CN=simplerisk" && \ openssl x509 -req -days 365 -in /etc/apache2/ssl/ssl.crt/simplerisk.csr -signkey /etc/apache2/ssl/ssl.key/simplerisk.key -out /etc/apache2/ssl/ssl.crt/simplerisk.crt diff --git a/simplerisk/noble/Dockerfile b/simplerisk/noble/Dockerfile index 74ba9bb..5012068 100644 --- a/simplerisk/noble/Dockerfile +++ b/simplerisk/noble/Dockerfile @@ -63,8 +63,8 @@ RUN sed -i 's/\(upload_max_filesize =\) .*\(M\)/\1 5\2/g' /etc/php/8.3/apache2/p # Create SSL Certificates for Apache SSL RUN mkdir -p /etc/apache2/ssl/ssl.crt /etc/apache2/ssl/ssl.key && \ - openssl genrsa -des3 -passout pass:/passwords/pass_openssl.txt -out /etc/apache2/ssl/ssl.key/simplerisk.pass.key && \ - openssl rsa -passin pass:/passwords/pass_openssl.txt -in /etc/apache2/ssl/ssl.key/simplerisk.pass.key -out /etc/apache2/ssl/ssl.key/simplerisk.key && \ + openssl genrsa -des3 -passout file:/passwords/pass_openssl.txt -out /etc/apache2/ssl/ssl.key/simplerisk.pass.key && \ + openssl rsa -passin file:/passwords/pass_openssl.txt -in /etc/apache2/ssl/ssl.key/simplerisk.pass.key -out /etc/apache2/ssl/ssl.key/simplerisk.key && \ rm /etc/apache2/ssl/ssl.key/simplerisk.pass.key && \ openssl req -new -key /etc/apache2/ssl/ssl.key/simplerisk.key -out /etc/apache2/ssl/ssl.crt/simplerisk.csr -subj "/CN=simplerisk" && \ openssl x509 -req -days 365 -in /etc/apache2/ssl/ssl.crt/simplerisk.csr -signkey /etc/apache2/ssl/ssl.key/simplerisk.key -out /etc/apache2/ssl/ssl.crt/simplerisk.crt