diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 62fe31de..c5f1aacc 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -21,7 +21,7 @@ ARG DEFAULT_GROUPS=x25519:x448:kyber512:p256_kyber512:kyber768:p384_kyber768:kyb ARG NGINX_VERSION=1.25.2 # Define the degree of parallelism when building the image; leave the number away only if you know what you are doing -ARG MAKE_DEFINES="-j" +ARG MAKE_DEFINES="-j 18" FROM alpine:3.13 as intermediate @@ -126,5 +126,7 @@ STOPSIGNAL SIGTERM # Enable a normal user to create new server keys off set CA RUN addgroup -g 1000 -S oqs && adduser --uid 1000 -S oqs -G oqs && chown -R oqs.oqs ${INSTALLDIR} USER oqs +# From nginx 1.25.2: "nginx does not try to load OpenSSL configuration if the --with-openssl option was used to built OpenSSL and the OPENSSL_CONF environment variable is not set". +# We therefore have to set the OPENSSL_CONF environment variable. ENV OPENSSL_CONF ${OSSLDIR}/ssl/openssl.cnf CMD ["nginx", "-c", "nginx-conf/nginx.conf", "-g", "daemon off;"] diff --git a/nginx/fulltest-provider/README.md b/nginx/fulltest-provider/README.md index cce37b43..7f49b225 100644 --- a/nginx/fulltest-provider/README.md +++ b/nginx/fulltest-provider/README.md @@ -34,6 +34,8 @@ Note that, the oqs-nginx-{LIBOQS_VERSION}.tgz package contains all required conf Execute `OPENSSL_CONF=/opt/openssl/.openssl/ssl/openssl.cnf /opt/nginx/sbin/nginx -c /opt/nginx/interop.conf` to start the test server. +*Note*: From nginx version 1.25.2, nginx does not try to load OpenSSL configuration if the --with-openssl option was used to built OpenSSL. We therefore have to set the `OPENSSL_CONF` environment variable when activating nginx. + *Note*: As the server many of ports, the server may need to be configured to permit this, e.g., using `ulimit -S -n 4096`. #### Test run