Fixed missed ARG names and updated git commit ids

Signed-off-by: Alex Bozarth <[email protected]>
open-quantum-safe · Nov 5, 2024 · 4ce8e49 · 4ce8e49
1 parent 95350ba
commit 4ce8e49
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/epiphany/README.md b/epiphany/README.md
@@ -1,7 +1,7 @@
 # DEPRECATED
 
 > [!Warning]
-> This integration is longer supported due to lack of interest and support, if you're interested in revitalizing this demo please submit a PR. A previous update attempt can be found [here](https://github.com/open-quantum-safe/oqs-demos/pull/298/commits/9a9696f04fc9e859c9df605dd088b82b62307a96)
+> This integration is longer supported due to lack of interest and support, if you're interested in revitalizing this demo please submit a PR. A previous update attempt can be found [here](https://github.com/open-quantum-safe/oqs-demos/commit/da3d03042a0b39caf500f0ce3744145e66b09f70)
 
 This directory contains a Dockerfile that builds the GNOME web browser epiphany such as to run TLS 1.3 using OQS-OpenSSL.
 

diff --git a/nginx/fulltest/Dockerfile b/nginx/fulltest/Dockerfile
@@ -3,11 +3,11 @@
 # First: global build arguments:
 
 # liboqs build type variant; maximum portability of image:
-ARG LIBOQS_VERSION=0.11.0
+ARG LIBOQS_TAG=0.11.0
 
-ARG OPENSSL_VERSION=openssl-3.3.2
+ARG OPENSSL_TAG=openssl-3.3.2
 
-ARG OQS_PROVIDER_VERSION=0.6.1
+ARG OQSPROVIDER_TAG=0.6.1
 
 ARG LIBOQS_BUILD_DEFINES="-DOQS_DIST_BUILD=ON"
 
@@ -39,9 +39,9 @@ FROM ubuntu:focal-20230412 as intermediate
 ARG BASEDIR
 ARG CONFIGDIR
 ARG CAROOTDIR
-ARG LIBOQS_VERSION
-ARG OPENSSL_VERSION
-ARG OQS_PROVIDER_VERSION
+ARG LIBOQS_TAG
+ARG OPENSSL_TAG
+ARG OQSPROVIDER_TAG
 ARG LIBOQS_BUILD_DEFINES
 ARG INSTALLDIR
 ARG SIG_ALG
@@ -56,9 +56,9 @@ RUN apt update && apt install -y sed libpcre3 libpcre3-dev libtool automake auto
 
 # get OQS sources
 WORKDIR /opt
-RUN git clone --depth 1 --branch ${LIBOQS_VERSION} https://github.com/open-quantum-safe/liboqs && \
-    git clone --depth 1 --branch ${OQS_PROVIDER_VERSION} https://github.com/open-quantum-safe/oqs-provider.git && \
-    git clone --depth 1 --branch ${OPENSSL_VERSION} https://github.com/openssl/openssl.git && \
+RUN git clone --depth 1 --branch ${LIBOQS_TAG} https://github.com/open-quantum-safe/liboqs && \
+    git clone --depth 1 --branch ${OQSPROVIDER_TAG} https://github.com/open-quantum-safe/oqs-provider.git && \
+    git clone --depth 1 --branch ${OPENSSL_TAG} https://github.com/openssl/openssl.git && \
     wget nginx.org/download/nginx-${NGINX_VERSION}.tar.gz && tar -zxvf nginx-${NGINX_VERSION}.tar.gz;
 
 # build liboqs (static only)
@@ -112,10 +112,10 @@ RUN for i in 128 192 256; do echo "seclevel:$i"; OPENSSL_MODULES=${OSSLDIR}/lib6
 
 RUN python3 genconfig.py
 
-RUN sed -i "s/LIBOQS_RELEASE/${LIBOQS_VERSION}/g" index-base.html
-RUN sed -i "s/OQSPROVIDER_RELEASE/${OQS_PROVIDER_VERSION}/g" index-base.html
-#RUN sed -i "s/LIBOQS_RELEASE/${LIBOQS_VERSION}/g" chromium-base.html
-#RUN sed -i "s/OQSPROVIDER_RELEASE/${OQS_PROVIDER_VERSION}/g" chromium-base.html
+RUN sed -i "s/LIBOQS_RELEASE/${LIBOQS_TAG}/g" index-base.html
+RUN sed -i "s/OQSPROVIDER_RELEASE/${OQSPROVIDER_TAG}/g" index-base.html
+#RUN sed -i "s/LIBOQS_RELEASE/${LIBOQS_TAG}/g" chromium-base.html
+#RUN sed -i "s/OQSPROVIDER_RELEASE/${OQSPROVIDER_TAG}/g" chromium-base.html
 
 RUN rm -rf ${INSTALLDIR}/pki
 RUN rm -rf ${INSTALLDIR}/logs/*
@@ -153,7 +153,7 @@ COPY --from=intermediate ${OSSLDIR} ${OSSLDIR}
 COPY --from=intermediate ${CAROOTDIR} ${CAROOTDIR}
 
 # Package for deployment
-RUN tar czvf oqs-nginx-${LIBOQS_VERSION}.tgz ${BASEDIR}
+RUN tar czvf oqs-nginx-${LIBOQS_TAG}.tgz ${BASEDIR}
 
 # Package for root CA cert and key
-RUN tar czvf oqs-testserver-rootca-${LIBOQS_VERSION}.tgz ${CAROOTDIR}
+RUN tar czvf oqs-testserver-rootca-${LIBOQS_TAG}.tgz ${CAROOTDIR}
diff --git a/ngtcp2/Dockerfile-client b/ngtcp2/Dockerfile-client
@@ -8,7 +8,7 @@ FROM alpine:${ALPINE_VERSION} as intermediate
 ENV DEBIAN_FRONTEND=noninteractive
 
 # define the quictls openssl tag to be used
-ARG OPENSSL_TAG=openssl-3.1.7-quic1
+ARG OPENSSLQUIC_TAG=openssl-3.1.7-quic1
 
 # define the liboqs tag to be used
 ARG LIBOQS_TAG=0.11.0
@@ -35,7 +35,7 @@ WORKDIR /opt
 
 # get all sources
 RUN git clone --depth 1 --branch ${LIBOQS_TAG} https://github.com/open-quantum-safe/liboqs && \
-    git clone --depth 1 --branch ${OPENSSL_TAG} https://github.com/quictls/openssl.git && \
+    git clone --depth 1 --branch ${OPENSSLQUIC_TAG} https://github.com/quictls/openssl.git && \
     git clone --depth 1 --branch ${OQSPROVIDER_TAG} https://github.com/open-quantum-safe/oqs-provider.git && \
     git clone --depth 1 --branch ${NGHTTP3_TAG}  https://github.com/ngtcp2/nghttp3 && \
     git clone --depth 1 --branch ${NGTCP2_TAG} https://github.com/ngtcp2/ngtcp2

diff --git a/openlitespeed/README.md b/openlitespeed/README.md
@@ -1,7 +1,7 @@
 # DEPRECATED
 
 > [!Warning]
-> This integration is longer supported due to lack of interest and support, if you're interested in revitalizing this demo please submit a PR. A previous update attempt can be found [here](https://github.com/ajbozarth/oqs-demos/commit/24f81fbb05989249ad27d459e336cc90dac7a2c9)
+> This integration is longer supported due to lack of interest and support, if you're interested in revitalizing this demo please submit a PR. A previous update attempt can be found [here](https://github.com/open-quantum-safe/oqs-demos/commit/864f56e0015886e1ad931f82a0bbe93a5045eb1d)
 
 OpenLiteSpeed
 ===============