.github/workflows/main.yml

@@ -1,38 +0,0 @@
-name: ci
-
-on:
-  push:
-    branches:
-      - master
-    paths-ignore:
-      - '**/README.md'
-    tags:
-      - '*'
-
-jobs:
-
-  build-and-push:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Inject slug/short variables
-        uses: rlespinasse/github-slug-action@v4.x
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          push: true
-          tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.GITHUB_REPOSITORY_NAME_PART }}:${{ env.GITHUB_REF_SLUG }}
-            ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.GITHUB_REPOSITORY_NAME_PART }}:latest

Dockerfile

@@ -1,24 +1,23 @@
-FROM debian:12 AS builder
+FROM ubuntu:20.04 AS builder
 
 LABEL maintainer="Yury Muski <muski.yury@gmail.com>"
 
 ENV NGINX_PATH /etc/nginx
-ENV NGINX_VERSION 1.16.1
+ENV NGINX_VERSION 1.19.6
 
-ENV QUICHE_VERSION 0.18.0
+ENV QUICHE_VERSION 0.9.0
 
 WORKDIR /opt
 
 RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y libpcre3 libpcre3-dev zlib1g-dev zlib1g golang-go build-essential libbrotli-dev git curl cmake;
+    DEBIAN_FRONTEND=noninteractive apt-get install -y libpcre3 libpcre3-dev zlib1g-dev zlib1g golang-go build-essential git curl cmake;
 
 RUN curl -O https://nginx.org/download/nginx-$NGINX_VERSION.tar.gz && \
     tar xvzf nginx-$NGINX_VERSION.tar.gz && \
     git clone --branch $QUICHE_VERSION --recursive https://github.com/cloudflare/quiche && \
-    cd /opt/quiche && git submodule update --init && cd /opt/ && \
     git clone --recursive https://github.com/google/ngx_brotli.git && \
     cd nginx-$NGINX_VERSION && \
-    patch -p01 < ../quiche/nginx/nginx-1.16.patch && \
+    patch -p01 < ../quiche/extras/nginx/nginx-1.16.patch && \ 
     curl https://sh.rustup.rs -sSf | sh -s -- -y -q && \
     export PATH="$HOME/.cargo/bin:$PATH" && \
     ./configure            	\
@@ -63,13 +62,13 @@ RUN curl -O https://nginx.org/download/nginx-$NGINX_VERSION.tar.gz && \
     --with-stream_ssl_preread_module \
     --add-module=/opt/ngx_brotli \
     --with-http_v3_module 	\
-    --with-openssl=/opt/quiche/quiche/deps/boringssl \
+    --with-openssl=/opt/quiche/deps/boringssl \
     --build="quiche-$(git --git-dir=../quiche/.git rev-parse --short HEAD)" \
     --with-quiche=/opt/quiche &&\
     make && \
     make install;
 
-FROM debian:12-slim
+FROM ubuntu:20.04
 
 COPY --from=builder /usr/sbin/nginx /usr/sbin/
 COPY --from=builder /etc/nginx/ /etc/nginx/

README.md

@@ -4,11 +4,11 @@ Nginx compiled with *BoringSSL* and *quiche* for *HTTP3* support, *Brotli* suppo
 ## version
 
 nginx version: nginx/1.19.6 (quiche-ad9d933)
-quiche 0.18.0
+quiche 0.9.0
 
 Based on ubuntu:20.04, size 109MB
 
-Link for [quiche + nginx manual](https://github.com/cloudflare/quiche/tree/master/nginx)
+Link for [quiche + nginx manual](https://github.com/cloudflare/quiche/tree/master/extras/nginx)
 
 ### usage
 - get certs from certbot in /etc/letsencrypt/

example.nginx.conf

@@ -62,7 +62,7 @@ http {
             return 200 "http3 on $hostname";
             add_header Content-Type text/plain;
             # Add Alt-Svc header to negotiate HTTP/3.
-            add_header alt-svc 'h3=":443"; ma=86400';
+            add_header alt-svc 'h3-27=":443"; ma=86400, h3-28=":443"; ma=86400, h3-29=":443"; ma=86400, h3=":443"; ma=86400';
         }
 
     }