Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Currently available integrations at their respective support level:
| **nginx** | [Github: oqs-demos/nginx](nginx) | [Dockerhub: openquantumsafe/nginx](https://hub.docker.com/repository/docker/openquantumsafe/nginx), [Dockerhub: openquantumsafe/nginx-quic](https://hub.docker.com/repository/docker/openquantumsafe/nginx-quic) | [![nginx](https://github.com/open-quantum-safe/oqs-demos/actions/workflows/nginx.yml/badge.svg)](https://github.com/open-quantum-safe/oqs-demos/actions/workflows/nginx.yml) Maintained: @baentsch, @bhess, @pi-314159
| **Chromium** | [Github: oqs-demos/chromium](chromium) (limited support) | - | Maintained: @pi-314159
| **Locust** | [Github: oqs-demos/locust](locust) | - | [![locust](https://github.com/open-quantum-safe/oqs-demos/actions/workflows/locust.yml/badge.svg)](https://github.com/open-quantum-safe/oqs-demos/actions/workflows/locust.yml) Maintained: @davidgca
| **Wireshark** | [Github: oqs-demos/wireshark](wireshark) | [Dockerhub: openquantumsafe/wireshark](https://hub.docker.com/repository/docker/openquantumsafe/wireshark) | [![wireshark](https://github.com/open-quantum-safe/oqs-demos/actions/workflows/wireshark.yml/badge.svg)](https://github.com/open-quantum-safe/oqs-demos/actions/workflows/wireshark.yml) Maintained: @hawazyn
| **Wireshark** | [Github: oqs-demos/wireshark](wireshark) | [Dockerhub: openquantumsafe/wireshark](https://hub.docker.com/repository/docker/openquantumsafe/wireshark) | [![wireshark](https://github.com/open-quantum-safe/oqs-demos/actions/workflows/wireshark.yml/badge.svg)](https://github.com/open-quantum-safe/oqs-demos/actions/workflows/wireshark.yml) Maintained: @alraddady
| **NodeJS** | [Github: oqs-demos/nodejs](nodejs) | [Dockerhub: openquantumsafe/nodejs](https://hub.docker.com/repository/docker/openquantumsafe/nodejs) | [![nodejs](https://github.com/open-quantum-safe/oqs-demos/actions/workflows/nodejs.yml/badge.svg)](https://github.com/open-quantum-safe/oqs-demos/actions/workflows/nodejs.yml) Maintained: @davidkel
| **OpenSSH** | [Github: oqs-demos/openssh](openssh) | [Dockerhub: openquantumsafe/openssh](https://hub.docker.com/repository/docker/openquantumsafe/openssh) | [![openssh](https://github.com/open-quantum-safe/oqs-demos/actions/workflows/openssh.yml/badge.svg)](https://github.com/open-quantum-safe/oqs-demos/actions/workflows/openssh.yml) Unmaintained
| **OpenVPN** | [Github: oqs-demos/openvpn](openvpn) | [Dockerhub: openquantumsafe/openvpn](https://hub.docker.com/repository/docker/openquantumsafe/openvpn) | [![openvpn](https://github.com/open-quantum-safe/oqs-demos/actions/workflows/openvpn.yml/badge.svg)](https://github.com/open-quantum-safe/oqs-demos/actions/workflows/openvpn.yml) Unmaintained
Expand Down
4 changes: 2 additions & 2 deletions curl/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ARG ALPINE_VERSION=3.21
ARG OPENSSL_TAG=openssl-3.4.0
ARG LIBOQS_TAG=0.12.0
ARG OQSPROVIDER_TAG=0.8.0
ARG CURL_VERSION=8.11.1
ARG CURL_VERSION=8.13.0
ARG INSTALLDIR=/opt/oqssa

# Specify supported signature and key encapsulation mechanisms (KEM) algorithms.
Expand All @@ -21,7 +21,7 @@ ARG INSTALLDIR
ARG SIG_ALG
ARG DEFAULT_GROUPS

LABEL version="5"
LABEL version="6"

# Install required build tools and system dependencies.
RUN apk update && apk --no-cache add build-base linux-headers \
Expand Down
17 changes: 13 additions & 4 deletions curl/Dockerfile-QUIC
Original file line number Diff line number Diff line change
@@ -1,19 +1,28 @@
ARG CURL_VERSION=8.11.1
ARG QUICHE_VERSION=0.22.0
ARG CURL_VERSION=8.13.0
ARG QUICHE_VERSION=0.23.5

# Stage 1: Build - Compile and assemble all necessary components and dependencies.
FROM ubuntu:latest AS build
ARG CURL_VERSION
ARG QUICHE_VERSION

# Install required build tools and system dependencies.
# Install required build tools and system dependencies (excluding rustc/cargo from apt)
RUN apt-get update && apt-get install -y --no-install-recommends \
cmake gcc ninja-build libunwind-dev \
pkg-config build-essential \
cargo git wget ca-certificates \
git wget ca-certificates curl \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

# Install Rust using rustup to ensure we get a version >= 1.81
# quiche v0.23.5 requires rustc >= 1.81, but until now Ubuntu does not provide it via apt.
# In the future, if Ubuntu includes rustc >= 1.81 in its default repositories,
# this rustup installation can be removed and replaced with a standard `apt install rustc cargo`.
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \
ln -s /root/.cargo/bin/rustc /usr/local/bin/rustc && \
ln -s /root/.cargo/bin/cargo /usr/local/bin/cargo && \
rustc --version

# Download and prepare source files needed for the build process.
WORKDIR /root
RUN git clone --branch master --depth 1 https://github.com/open-quantum-safe/boringssl.git bssl \
Expand Down
4 changes: 2 additions & 2 deletions nginx/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ARG ALPINE_VERSION=3.21
ARG OPENSSL_TAG=openssl-3.4.0
ARG LIBOQS_TAG=0.12.0
ARG OQSPROVIDER_TAG=0.8.0
ARG NGINX_VERSION=1.27.3
ARG NGINX_VERSION=1.27.4
ARG BASEDIR="/opt"
ARG INSTALLDIR=${BASEDIR}/nginx

Expand Down Expand Up @@ -126,4 +126,4 @@ RUN addgroup -g 1000 -S oqs \
# Run as non-root user
USER oqs
STOPSIGNAL SIGTERM
CMD ["nginx", "-c", "nginx-conf/nginx.conf", "-g", "daemon off;"]
CMD ["nginx", "-c", "nginx-conf/nginx.conf", "-g", "daemon off;"]
14 changes: 6 additions & 8 deletions nginx/Dockerfile-QUIC
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Define nginx version
ARG NGINX_VERSION=1.26.2
ARG NGINX_VERSION=1.27.5

# Stage 1: Build - Compile and assemble all necessary components and dependencies
FROM ubuntu:latest AS build
Expand All @@ -10,8 +9,8 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
g++ make cmake git build-essential \
libpcre3 libpcre3-dev zlib1g-dev \
wget ninja-build libunwind-dev \
pkg-config python3 ca-certificates && \
rm -rf /var/lib/apt/lists/*
pkg-config python3 ca-certificates \
&& rm -rf /var/lib/apt/lists/*

# Download and prepare source files needed for the build process
WORKDIR /home/build
Expand All @@ -30,9 +29,8 @@ RUN cmake -GNinja \
ninja && ninja install

# Build and install boringssl
WORKDIR /home/build/boringssl
RUN mkdir build && cd build && \
cmake -GNinja \
WORKDIR /home/build/boringssl/build
RUN cmake -GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS=1 .. && \
ninja && \
Expand Down Expand Up @@ -115,4 +113,4 @@ RUN mkdir -p /var/run /var/cache/nginx /var/log/nginx && \
EXPOSE 80 443 443/udp

STOPSIGNAL SIGQUIT
CMD ["nginx", "-g", "daemon off;"]
CMD ["nginx", "-g", "daemon off;"]
4 changes: 2 additions & 2 deletions openvpn/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ARG UBUNTU_VERSION=24.04
ARG OPENSSL_TAG=openssl-3.4.0
ARG LIBOQS_TAG=0.12.0
ARG OQSPROVIDER_TAG=0.8.0
ARG OPENVPN_TAG=v2.6.12
ARG OPENVPN_TAG=v2.6.14
ARG INSTALLDIR=/opt/oqssa
ARG OPENVPNDIR=/home/openvpn

Expand All @@ -13,7 +13,7 @@ ARG KEM_ALGLIST="mlkem768:p384_mlkem768"
# Stage 1: Build - Compile and assemble all necessary components and dependencies
FROM ubuntu:${UBUNTU_VERSION} AS intermediate

LABEL version="3"
LABEL version="4"

ARG OPENSSL_TAG
ARG LIBOQS_TAG
Expand Down
4 changes: 2 additions & 2 deletions wireshark/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Define build arguments for version tags, installation paths, and configurations
ARG UBUNTU_VERSION=24.04
ARG WIRESHARK_VERSION=4.4.3
ARG WIRESHARK_VERSION=4.4.6
ARG OPENSSL_TAG=3.4.0
ARG LIBOQS_TAG=0.12.0
ARG OQSPROVIDER_TAG=0.8.0
Expand All @@ -9,7 +9,7 @@ ARG INSTALLDIR=/opt/oqs
# Stage 1: Build - Compile and assemble all necessary components and dependencies
FROM ubuntu:${UBUNTU_VERSION} AS build

LABEL version="2"
LABEL version="3"

ENV DEBIAN_FRONTEND=noninteractive
ARG WIRESHARK_VERSION
Expand Down