From 77dab8caacb13b233e073d1f5f46b6bb18fc7b77 Mon Sep 17 00:00:00 2001
From: Chitoku <chitoku-k@users.noreply.github.com>
Date: Fri, 13 Sep 2024 03:22:53 +0900
Subject: [PATCH] Migrate from ngtcp2 to OpenSSL QUIC (#2678)

* Bump curl from curl-8_9_1 to curl-8_10_0 in /api

* Migrate from ngtcp2 to OpenSSL QUIC

* Update Dependencies Workflow
---
 .../workflows/_update-dockerfile-by-git.yml   |  1 +
 .github/workflows/dependencies.yml            | 10 ++-------
 api/Dockerfile                                | 21 ++++---------------
 3 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/_update-dockerfile-by-git.yml b/.github/workflows/_update-dockerfile-by-git.yml
index 424c24a00..8e03d7b27 100644
--- a/.github/workflows/_update-dockerfile-by-git.yml
+++ b/.github/workflows/_update-dockerfile-by-git.yml
@@ -51,6 +51,7 @@ jobs:
         id: new-version
         run: |
           git ls-remote --refs --tags --sort=-version:refname '${{ inputs.git-url }}' '${{ inputs.git-tag-filter }}' |
+            grep -v -E 'alpha|beta' |
             awk 'NR == 1 { gsub(".*/", ""); print "version=" $1 }' >> "$GITHUB_OUTPUT"
       - name: Update version
         if: ${{ steps.current-version.outputs.version != steps.new-version.outputs.version }}
diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
index 56939eaa6..017ceed1e 100644
--- a/.github/workflows/dependencies.yml
+++ b/.github/workflows/dependencies.yml
@@ -25,20 +25,14 @@ jobs:
             directory: /api
             filename: api/Dockerfile
             arg: OPENSSL_VERSION
-            git-url: https://github.com/quictls/openssl
-            git-tag-filter: openssl-*quic*
+            git-url: https://github.com/openssl/openssl
+            git-tag-filter: openssl-*
           - name: nghttp3
             directory: /api
             filename: api/Dockerfile
             arg: NGHTTP3_VERSION
             git-url: https://github.com/ngtcp2/nghttp3
             git-tag-filter: v*
-          - name: ngtcp2
-            directory: /api
-            filename: api/Dockerfile
-            arg: NGTCP2_VERSION
-            git-url: https://github.com/ngtcp2/ngtcp2
-            git-tag-filter: v*
           - name: curl
             directory: /api
             filename: api/Dockerfile
diff --git a/api/Dockerfile b/api/Dockerfile
index cc196e6ec..b5ea2f0a0 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -12,8 +12,8 @@ RUN --mount=type=cache,id=api:/var/cache/apt,target=/var/cache/apt \
         pkg-config
 
 FROM build-dependencies AS openssl
-ARG OPENSSL_VERSION=openssl-3.1.7-quic1
-RUN git clone --depth=1 --recurse-submodules -b $OPENSSL_VERSION https://github.com/quictls/openssl && \
+ARG OPENSSL_VERSION=openssl-3.3.2
+RUN git clone --depth=1 --recurse-submodules -b $OPENSSL_VERSION https://github.com/openssl/openssl && \
     cd openssl && \
     ./config enable-tls1_3 && \
     make -j $(nproc) && \
@@ -28,26 +28,14 @@ RUN git clone --depth=1 --recurse-submodules -b $NGHTTP3_VERSION https://github.
     make -j $(nproc) && \
     make install
 
-FROM build-dependencies AS ngtcp2
-COPY --from=openssl /usr/local/ /usr/local/
-COPY --from=nghttp3 /usr/local/ /usr/local/
-ARG NGTCP2_VERSION=v1.7.0
-RUN git clone --depth=1 --recurse-submodules -b $NGTCP2_VERSION https://github.com/ngtcp2/ngtcp2 && \
-    cd ngtcp2 && \
-    autoreconf -fi && \
-    ./configure PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig --enable-lib-only && \
-    make -j $(nproc) && \
-    make install
-
 FROM build-dependencies AS curl
 COPY --from=openssl /usr/local/ /usr/local/
 COPY --from=nghttp3 /usr/local/ /usr/local/
-COPY --from=ngtcp2 /usr/local/ /usr/local/
-ARG CURL_VERSION=curl-8_9_1
+ARG CURL_VERSION=curl-8_10_0
 RUN git clone --depth=1 -b $CURL_VERSION https://github.com/curl/curl && \
     cd curl && \
     autoreconf -fi && \
-    ./configure --enable-alt-svc --with-openssl --with-nghttp2 --with-nghttp3 --with-ngtcp2 --without-libpsl && \
+    ./configure --enable-alt-svc --with-openssl --with-openssl-quic --with-nghttp2 --with-nghttp3 --without-libpsl && \
     make -j $(nproc) && \
     make install
 
@@ -56,7 +44,6 @@ WORKDIR /var/www/html/api
 COPY --from=openssl /usr/local/bin/ /usr/local/bin/
 COPY --from=openssl /usr/local/include/ /usr/local/include/
 COPY --from=nghttp3 /usr/local/include/ /usr/local/include/
-COPY --from=ngtcp2 /usr/local/include/ /usr/local/include/
 COPY --from=curl /usr/local/include/curl/ /usr/local/include/curl/
 COPY --from=curl /usr/local/bin/curl /usr/local/bin/
 COPY --from=curl /usr/local/bin/curl-config /usr/local/bin/