Skip to content

Commit 9cceb40

Browse files
committed
nginx: replace deprecated http2 listen parameter with directive
- ci: skip ppc64le and loong64 builds; upgrade qemu-binfmt for better support
1 parent 5578ca2 commit 9cceb40

3 files changed

Lines changed: 13 additions & 11 deletions

File tree

.github/workflows/docker-image.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ jobs:
2727
# arm/v7 and arm/v6: kernel compat layer (no TCG at all)
2828
- { platforms: linux/arm/v7, build_dir: mainline, dockerfile: Dockerfile, tag: mainline-armv7-alpine, runner: ubuntu-24.04-arm }
2929
- { platforms: linux/arm/v6, build_dir: mainline, dockerfile: Dockerfile, tag: mainline-armv6-alpine, runner: ubuntu-24.04-arm }
30-
- { platforms: linux/ppc64le, build_dir: mainline, dockerfile: Dockerfile, tag: mainline-ppc64le-alpine, runner: ubuntu-24.04-arm }
30+
#- { platforms: linux/ppc64le, build_dir: mainline, dockerfile: Dockerfile, tag: mainline-ppc64le-alpine, runner: ubuntu-24.04-arm }
3131
- { platforms: linux/riscv64, build_dir: mainline, dockerfile: Dockerfile, tag: mainline-riscv64-alpine, runner: ubuntu-24.04-arm }
32-
- { platforms: linux/loong64, build_dir: mainline, dockerfile: Dockerfile.loongarch64, tag: mainline-loong64-alpine, runner: ubuntu-24.04-arm }
32+
#- { platforms: linux/loong64, build_dir: mainline, dockerfile: Dockerfile.loongarch64, tag: mainline-loong64-alpine, runner: ubuntu-24.04-arm }
3333
#- { platforms: linux/mips64le, build_dir: mainline, dockerfile: Dockerfile.mips64le, tag: mainline-mips64le-alpine, runner: ubuntu-24.04-arm }
3434
- { platforms: linux/arm/v7, build_dir: stable, dockerfile: Dockerfile, tag: stable-armv7-alpine, runner: ubuntu-24.04-arm }
3535
- { platforms: linux/arm/v6, build_dir: stable, dockerfile: Dockerfile, tag: stable-armv6-alpine, runner: ubuntu-24.04-arm }
36-
- { platforms: linux/ppc64le, build_dir: stable, dockerfile: Dockerfile, tag: stable-ppc64le-alpine, runner: ubuntu-24.04-arm }
36+
#- { platforms: linux/ppc64le, build_dir: stable, dockerfile: Dockerfile, tag: stable-ppc64le-alpine, runner: ubuntu-24.04-arm }
3737
- { platforms: linux/riscv64, build_dir: stable, dockerfile: Dockerfile, tag: stable-riscv64-alpine, runner: ubuntu-24.04-arm }
38-
- { platforms: linux/loong64, build_dir: stable, dockerfile: Dockerfile.loongarch64, tag: stable-loong64-alpine, runner: ubuntu-24.04-arm }
38+
#- { platforms: linux/loong64, build_dir: stable, dockerfile: Dockerfile.loongarch64, tag: stable-loong64-alpine, runner: ubuntu-24.04-arm }
3939
#- { platforms: linux/mips64le, build_dir: stable, dockerfile: Dockerfile.mips64le, tag: stable-mips64le-alpine, runner: ubuntu-24.04-arm }
4040

4141
# --- QEMU on x86 runner ---
@@ -58,7 +58,7 @@ jobs:
5858
uses: docker/setup-qemu-action@v3
5959
with:
6060
# qemu-v9.2.0-51+ required for loong64 support
61-
image: tonistiigi/binfmt:qemu-v10.1.3-60
61+
image: tonistiigi/binfmt:qemu-v10.2.1-65
6262

6363
- name: Set up Docker Buildx
6464
uses: docker/setup-buildx-action@v3
@@ -121,9 +121,9 @@ jobs:
121121
${{ env.GHCR_IMAGE }}:mainline-aarch64-alpine \
122122
${{ env.GHCR_IMAGE }}:mainline-armv7-alpine \
123123
${{ env.GHCR_IMAGE }}:mainline-armv6-alpine \
124-
${{ env.GHCR_IMAGE }}:mainline-ppc64le-alpine \
125124
${{ env.GHCR_IMAGE }}:mainline-riscv64-alpine \
126-
${{ env.GHCR_IMAGE }}:mainline-loong64-alpine
125+
# ${{ env.GHCR_IMAGE }}:mainline-loong64-alpine
126+
# ${{ env.GHCR_IMAGE }}:mainline-ppc64le-alpine
127127
# ${{ env.GHCR_IMAGE }}:mainline-s390x-alpine
128128
# ${{ env.GHCR_IMAGE }}:mainline-mips64le-alpine
129129
@@ -137,9 +137,9 @@ jobs:
137137
${{ env.GHCR_IMAGE }}:stable-aarch64-alpine \
138138
${{ env.GHCR_IMAGE }}:stable-armv7-alpine \
139139
${{ env.GHCR_IMAGE }}:stable-armv6-alpine \
140-
${{ env.GHCR_IMAGE }}:stable-ppc64le-alpine \
141140
${{ env.GHCR_IMAGE }}:stable-riscv64-alpine \
142-
${{ env.GHCR_IMAGE }}:stable-loong64-alpine
141+
# ${{ env.GHCR_IMAGE }}:stable-loong64-alpine
142+
# ${{ env.GHCR_IMAGE }}:stable-ppc64le-alpine
143143
# ${{ env.GHCR_IMAGE }}:stable-s390x-alpine
144144
# ${{ env.GHCR_IMAGE }}:stable-mips64le-alpine
145145

mainline/nginx.vh.no-default.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ server {
1111
}
1212

1313
server {
14-
listen 443 ssl http2 default_server;
14+
listen 443 ssl default_server;
15+
http2 on;
1516
ssl_reject_handshake on;
1617
}

stable/nginx.vh.no-default.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ server {
1111
}
1212

1313
server {
14-
listen 443 ssl http2 default_server;
14+
listen 443 ssl default_server;
15+
http2 on;
1516
ssl_reject_handshake on;
1617
}

0 commit comments

Comments
 (0)