Skip to content

Commit cf55e34

Browse files
renovate[bot]Zoey2936
renovate[bot]
authored and
Zoey2936
committed
see commit body
dep updates rename NGINX_HSTS_SUBDMAINS env to NGINX_HSTS_SUBDOMAINS (reported and partly fixed by @dormancygrace) fix usage of $server_port as forwarding port in streams by @joshf67 impove/unify version naming a bit (still not perfect) also thanks to @shedowe19 for testing add anubis example to readme and improve some config examples enable early hints by default (now supported because of nginx update to v1.29) Signed-off-by: Zoey <zoey@z0ey.de>
1 parent 8b2bc28 commit cf55e34

File tree

22 files changed

+309
-311
lines changed

22 files changed

+309
-311
lines changed

‎.github/workflows/caddy-fmt.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
name: caddy-fmt
1+
name: Format Caddyfile
22
on:
33
push:
44
branches:
55
- develop
66
paths:
77
- .github/workflows/caddy-fmt.yml
8-
- Caddy.Dockerfile
9-
- Caddyfile
8+
- global/caddy/Dockerfile
9+
- global/caddy/Caddyfile
1010
workflow_dispatch:
1111
jobs:
1212
caddy-fmt:
@@ -16,14 +16,14 @@ jobs:
1616
uses: actions/checkout@v4
1717
- name: Read version
1818
id: version
19-
run: echo "version=$(cat Caddy.Dockerfile | grep "^COPY --from=caddy:.*$" | head -1 | sed "s|COPY --from=caddy:\([0-9.]\+\).*|\1|g")" >> $GITHUB_OUTPUT
19+
run: echo "version=$(cat global/caddy/Dockerfile | grep "^COPY --from=caddy:.*$" | head -1 | sed "s|COPY --from=caddy:\([0-9.]\+\).*|\1|g")" >> $GITHUB_OUTPUT
2020
- name: caddy-fmt
2121
run: |
22-
docker run --rm -v ${{ github.workspace }}/Caddyfile:/etc/caddy/Caddyfile caddy:${{ steps.version.outputs.version }} caddy fmt --overwrite /etc/caddy/Caddyfile
22+
docker run --rm -v ${{ github.workspace }}/global/caddy/Caddyfile:/etc/caddy/Caddyfile caddy:${{ steps.version.outputs.version }} caddy fmt --overwrite /etc/caddy/Caddyfile
2323
- name: push changes
2424
run: |
25-
git add -A
25+
git add global/caddy/Caddyfile
2626
git config user.name "GitHub"
2727
git config user.email "noreply@github.com"
28-
git diff-index --quiet HEAD || git commit -sm "caddy-fmt"
28+
git diff-index --quiet HEAD || git commit -sm "caddy fmt"
2929
git push

‎.github/workflows/caddy-latest.yml

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎.github/workflows/caddy.yml

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ on:
55
- develop
66
paths:
77
- .github/workflows/caddy.yml
8-
- Caddy.Dockerfile
9-
- Caddyfile
8+
- global/caddy/Dockerfile
9+
- global/caddy/Caddyfile
1010
workflow_dispatch:
1111
jobs:
1212
build:
@@ -23,31 +23,26 @@ jobs:
2323
with:
2424
driver-opts: env.BUILDKIT_STEP_LOG_MAX_SIZE=-1
2525
- name: Login to DockerHub
26-
if: ${{ github.event_name != 'pull_request' }}
2726
uses: docker/login-action@v3
2827
with:
2928
username: ${{ secrets.DOCKER_USERNAME }}
3029
password: ${{ secrets.DOCKER_PASSWORD }}
31-
- name: Convert Username
32-
id: un
33-
run: echo "un=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
34-
- name: Convert repository name
35-
id: rn
36-
run: echo "rn=$(echo "${{ github.event.repository.name }}" | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
3730
- name: Login to GitHub Container Registry
3831
uses: docker/login-action@v3
3932
with:
4033
registry: ghcr.io
41-
username: ${{ steps.un.outputs.un }}
34+
username: zoeyvid
4235
password: ${{ github.token }}
4336
- name: Build
4437
uses: docker/build-push-action@v6
45-
if: ${{ github.event_name != 'pull_request' }}
4638
with:
47-
context: .
48-
file: ./Caddy.Dockerfile
49-
platforms: linux/amd64,linux/arm64,linux/arm/v7 #,linux/amd64/v2,linux/amd64/v3,linux/amd64/v4 #,linux/ppc64le,linux/s390x,linux/386,linux/arm/v6
50-
push: ${{ github.event_name != 'pull_request' }}
39+
context: global/caddy
40+
platforms: linux/amd64,linux/arm64
41+
push: true
5142
tags: |
52-
${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:caddy-${{ github.ref_name }}
53-
ghcr.io/${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:caddy-${{ github.ref_name }}
43+
zoeyvid/npmplus:caddy
44+
ghcr.io/zoeyvid/npmplus:caddy
45+
zoeyvid/npmplus:caddy-${{ github.run_number }}
46+
ghcr.io/zoeyvid/npmplus:caddy-${{ github.run_number }}
47+
zoeyvid/nginx-proxy-manager:caddy
48+
ghcr.io/zoeyvid/nginx-proxy-manager:caddy

‎.github/workflows/docker-latest.yml

Lines changed: 41 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,60 @@
1-
name: Docker push develop to latest
1+
name: Build latest Docker Image
22
on:
33
workflow_dispatch:
4+
inputs:
5+
tag:
6+
description: 'name of the release'
7+
required: true
8+
type: string
49
jobs:
510
docker:
611
runs-on: ubuntu-latest
712
steps:
13+
- name: Checkout
14+
uses: actions/checkout@v4
15+
- name: Set up QEMU
16+
uses: docker/setup-qemu-action@v3
17+
with:
18+
platforms: arm64
19+
- name: Set up Docker Buildx
20+
uses: docker/setup-buildx-action@v3
21+
with:
22+
driver-opts: env.BUILDKIT_STEP_LOG_MAX_SIZE=-1
823
- name: Login to DockerHub
9-
if: github.event_name != 'pull_request'
1024
uses: docker/login-action@v3
1125
with:
1226
username: ${{ secrets.DOCKER_USERNAME }}
1327
password: ${{ secrets.DOCKER_PASSWORD }}
14-
- name: Convert Username
15-
id: un
16-
run: echo "un=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
17-
- name: Convert repository name
18-
id: rn
19-
run: echo "rn=$(echo "${{ github.event.repository.name }}" | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
2028
- name: Login to GitHub Container Registry
2129
uses: docker/login-action@v3
2230
with:
2331
registry: ghcr.io
24-
username: ${{ steps.un.outputs.un }}
32+
username: zoeyvid
2533
password: ${{ github.token }}
26-
# - name: Login to forgejo
27-
# uses: docker/login-action@v3
28-
# with:
29-
# registry: forgejo.zvcdn.de
30-
# username: ${{ secrets.FORGEJO_USERNAME }}
31-
# password: ${{ secrets.FORGEJO_PASSWORD }}
32-
- name: Push develop to latest
34+
- name: version
3335
run: |
34-
docker buildx imagetools create --tag ${{ steps.un.outputs.un }}/nginx-proxy-manager:latest ${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:${{ github.ref_name }}
35-
docker buildx imagetools create --tag ghcr.io/${{ steps.un.outputs.un }}/nginx-proxy-manager:latest ghcr.io/${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:${{ github.ref_name }}
36-
37-
docker buildx imagetools create --tag ${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:latest ${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:${{ github.ref_name }}
38-
docker buildx imagetools create --tag ${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:${{ github.run_number }} ${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:${{ github.ref_name }}
39-
docker buildx imagetools create --tag ghcr.io/${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:latest ghcr.io/${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:${{ github.ref_name }}
40-
docker buildx imagetools create --tag ghcr.io/${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:${{ github.run_number }} ghcr.io/${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:${{ github.ref_name }}
41-
# docker buildx imagetools create --tag forgejo.zvcdn.de/${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:latest forgejo.zvcdn.de/${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:${{ github.ref_name }}
42-
# docker buildx imagetools create --tag forgejo.zvcdn.de/${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:${{ github.run_number }} forgejo.zvcdn.de/${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:${{ github.ref_name }}
36+
version="${{ inputs.tag }}-$(git rev-parse --short HEAD)-$(cat .version)"
37+
sed -i "s|\"0.0.0\"|\"$version\"|g" frontend/js/i18n/en-lang.json
38+
sed -i "s|\"0.0.0\"|\"$version\"|g" frontend/js/i18n/de-lang.json
39+
sed -i "s|\"0.0.0\"|\"$version\"|g" frontend/js/i18n/it-lang.json
40+
sed -i "s|\"0.0.0\"|\"$version\"|g" frontend/js/i18n/zh-lang.json
41+
sed -i "s|\"0.0.0\"|\"$version\"|g" frontend/package.json
42+
sed -i "s|\"0.0.0\"|\"$version\"|g" backend/package.json
43+
- name: Build
44+
uses: docker/build-push-action@v6
45+
with:
46+
context: .
47+
platforms: linux/amd64,linux/arm64
48+
push: true
49+
tags: |
50+
zoeyvid/npmplus:latest
51+
ghcr.io/zoeyvid/npmplus:latest
52+
zoeyvid/npmplus:${{ inputs.tag }}
53+
ghcr.io/zoeyvid/npmplus:${{ inputs.tag }}
54+
zoeyvid/npmplus:${{ github.run_number }}
55+
ghcr.io/zoeyvid/npmplus:${{ github.run_number }}
56+
zoeyvid/nginx-proxy-manager:latest
57+
ghcr.io/zoeyvid/nginx-proxy-manager:latest
4358
- name: Show Nginx version
4459
run: |
45-
docker run --rm --entrypoint nginx ${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:latest -V
46-
docker run --rm --entrypoint nginx ghcr.io/${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:latest -V
47-
# docker run --rm --entrypoint nginx forgejo.zvcdn.de/${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:latest -V
60+
docker run --rm --init --entrypoint nginx zoeyvid/npmplus:latest -V

‎.github/workflows/docker.yml

Lines changed: 14 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,18 @@ on:
66
paths:
77
- .github/workflows/docker.yml
88
- Dockerfile
9+
- global/certbot-dns-plugins.json
910
- frontend/**
1011
- backend/**
11-
- global/**
1212
- rootfs/**
13-
- src/**
1413
pull_request:
1514
paths:
1615
- .github/workflows/docker.yml
1716
- Dockerfile
17+
- global/certbot-dns-plugins.json
1818
- frontend/**
1919
- backend/**
20-
- global/**
2120
- rootfs/**
22-
- src/**
2321
workflow_dispatch:
2422
jobs:
2523
build:
@@ -30,7 +28,7 @@ jobs:
3028
- name: Set up QEMU
3129
uses: docker/setup-qemu-action@v3
3230
with:
33-
platforms: arm64 #all
31+
platforms: arm64
3432
- name: Set up Docker Buildx
3533
uses: docker/setup-buildx-action@v3
3634
with:
@@ -41,27 +39,15 @@ jobs:
4139
with:
4240
username: ${{ secrets.DOCKER_USERNAME }}
4341
password: ${{ secrets.DOCKER_PASSWORD }}
44-
- name: Convert Username
45-
id: un
46-
run: echo "un=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
47-
- name: Convert repository name
48-
id: rn
49-
run: echo "rn=$(echo "${{ github.event.repository.name }}" | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
5042
- name: Login to GitHub Container Registry
5143
uses: docker/login-action@v3
5244
with:
5345
registry: ghcr.io
54-
username: ${{ steps.un.outputs.un }}
46+
username: zoeyvid
5547
password: ${{ github.token }}
56-
# - name: Login to forgejo
57-
# uses: docker/login-action@v3
58-
# with:
59-
# registry: forgejo.zvcdn.de
60-
# username: ${{ secrets.FORGEJO_USERNAME }}
61-
# password: ${{ secrets.FORGEJO_PASSWORD }}
6248
- name: version
6349
run: |
64-
version="$(cat .version)+$(git rev-parse --short HEAD)"
50+
version="$(git rev-parse --short HEAD)"
6551
sed -i "s|\"0.0.0\"|\"$version\"|g" frontend/js/i18n/en-lang.json
6652
sed -i "s|\"0.0.0\"|\"$version\"|g" frontend/js/i18n/de-lang.json
6753
sed -i "s|\"0.0.0\"|\"$version\"|g" frontend/js/i18n/it-lang.json
@@ -73,19 +59,15 @@ jobs:
7359
if: ${{ github.event_name != 'pull_request' }}
7460
with:
7561
context: .
76-
file: ./Dockerfile
77-
platforms: linux/amd64,linux/arm64 #,linux/amd64/v2,linux/amd64/v3,linux/amd64/v4 #,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6
78-
push: ${{ github.event_name != 'pull_request' }}
62+
platforms: linux/amd64,linux/arm64
63+
push: true
7964
tags: |
80-
${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:${{ github.ref_name }}
81-
ghcr.io/${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:${{ github.ref_name }}
82-
# forgejo.zvcdn.de/${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:${{ github.ref_name }}
65+
zoeyvid/npmplus:${{ github.ref_name }}
66+
ghcr.io/zoeyvid/npmplus:${{ github.ref_name }}
8367
- name: show version
8468
if: ${{ github.event_name != 'pull_request' }}
8569
run: |
86-
docker run --rm --entrypoint nginx ${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:${{ github.ref_name }} -V
87-
docker run --rm --entrypoint nginx ghcr.io/${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:${{ github.ref_name }} -V
88-
# docker run --rm --entrypoint nginx forgejo.zvcdn.de/${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:${{ github.ref_name }} -V
70+
docker run --rm --entrypoint nginx zoeyvid/npmplus:${{ github.ref_name }} -V
8971
- name: Set PR-Number (PR)
9072
if: ${{ github.event_name == 'pull_request' }}
9173
id: pr
@@ -95,17 +77,16 @@ jobs:
9577
if: ${{ github.event_name == 'pull_request' }}
9678
with:
9779
context: .
98-
file: ./Dockerfile
9980
platforms: linux/amd64,linux/arm64 #,linux/amd64/v2,linux/amd64/v3,linux/amd64/v4 #,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6
100-
push: ${{ github.event_name == 'pull_request' }}
101-
tags: ghcr.io/${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:${{ steps.pr.outputs.pr }}
81+
push: true
82+
tags: ghcr.io/zoeyvid/npmplus:${{ steps.pr.outputs.pr }}
10283
- name: show version (PR)
10384
if: ${{ github.event_name == 'pull_request' }}
104-
run: docker run --rm --entrypoint nginx ghcr.io/${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:${{ steps.pr.outputs.pr }} -V
85+
run: docker run --rm --entrypoint nginx ghcr.io/zoeyvid/npmplus:${{ steps.pr.outputs.pr }} -V
10586
- name: add comment (PR)
10687
uses: mshick/add-pr-comment@v2
10788
if: ${{ github.event_name == 'pull_request' }}
10889
with:
109-
message: "The Docker Image can now be found here: `ghcr.io/${{ steps.un.outputs.un }}/${{ steps.rn.outputs.rn }}:${{ steps.pr.outputs.pr }}`"
90+
message: "The Docker Image can now be found here: `ghcr.io/zoeyvid/npmplus:${{ steps.pr.outputs.pr }}`"
11091
repo-token: ${{ github.token }}
11192
refresh-message-position: true

‎.github/workflows/update-and-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
uses: actions/checkout@v4
1616
- uses: actions/setup-node@v4
1717
with:
18-
node-version: 21
18+
node-version: 22
1919
- name: eslint
2020
run: |
2121
cd backend

‎Caddyfile

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ RUN apk upgrade --no-cache -a && \
6262
sed -i "s|APPSEC_PROCESS_TIMEOUT=.*|APPSEC_PROCESS_TIMEOUT=10000|g" /src/crowdsec-nginx-bouncer/lua-mod/config_example.conf
6363

6464

65-
FROM zoeyvid/nginx-quic:514-python
65+
FROM zoeyvid/nginx-quic:515-python
6666
SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
6767
ENV NODE_ENV=production
6868
ARG CRS_VER=v4.15.0

0 commit comments

Comments
 (0)