Skip to content

Commit

Permalink
version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
yurymuski committed Sep 2, 2023
1 parent ddfdd70 commit 9e070a1
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 7 deletions.
38 changes: 38 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
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/[email protected]

- 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
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM ubuntu:20.04 AS builder
FROM debian:12 AS builder

LABEL maintainer="Yury Muski <[email protected]>"

ENV NGINX_PATH /etc/nginx
ENV NGINX_VERSION 1.19.6

ENV QUICHE_VERSION 0.9.0
ENV QUICHE_VERSION 0.18.0

WORKDIR /opt

Expand All @@ -17,7 +17,7 @@ RUN curl -O https://nginx.org/download/nginx-$NGINX_VERSION.tar.gz && \
git clone --branch $QUICHE_VERSION --recursive https://github.com/cloudflare/quiche && \
git clone --recursive https://github.com/google/ngx_brotli.git && \
cd nginx-$NGINX_VERSION && \
patch -p01 < ../quiche/extras/nginx/nginx-1.16.patch && \
patch -p01 < ../quiche/nginx/nginx-1.16.patch && \
curl https://sh.rustup.rs -sSf | sh -s -- -y -q && \
export PATH="$HOME/.cargo/bin:$PATH" && \
./configure \
Expand Down Expand Up @@ -68,7 +68,7 @@ RUN curl -O https://nginx.org/download/nginx-$NGINX_VERSION.tar.gz && \
make && \
make install;

FROM ubuntu:20.04
FROM debian:12-slim

COPY --from=builder /usr/sbin/nginx /usr/sbin/
COPY --from=builder /etc/nginx/ /etc/nginx/
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.9.0
quiche 0.18.0

Based on ubuntu:20.04, size 109MB

Link for [quiche + nginx manual](https://github.com/cloudflare/quiche/tree/master/extras/nginx)
Link for [quiche + nginx manual](https://github.com/cloudflare/quiche/tree/master/nginx)

### usage
- get certs from certbot in /etc/letsencrypt/
Expand Down
2 changes: 1 addition & 1 deletion example.nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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-27=":443"; ma=86400, h3-28=":443"; ma=86400, h3-29=":443"; ma=86400, h3=":443"; ma=86400';
add_header alt-svc 'h3=":443"; ma=86400';
}

}
Expand Down

0 comments on commit 9e070a1

Please sign in to comment.