Skip to content

Commit 1fe1087

Browse files
Merge pull request #3321 from bunkerity/dev
2 parents ab24f60 + 3ec65a2 commit 1fe1087

1,330 files changed

Lines changed: 285192 additions & 32732 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ body:
5151
label: BunkerWeb version
5252
description: What version of BunkerWeb are you running?
5353
placeholder: Version
54-
value: 1.6.8
54+
value: 1.6.9
5555
validations:
5656
required: true
5757
- type: dropdown

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ jobs:
3636
python -m pip install --no-cache-dir --require-hashes -r src/common/db/requirements.txt
3737
echo "CODEQL_PYTHON=$(which python)" >> $GITHUB_ENV
3838
- name: Initialize CodeQL
39-
uses: github/codeql-action/init@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
39+
uses: github/codeql-action/init@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
4040
with:
4141
languages: ${{ matrix.language }}
4242
config-file: ./.github/codeql.yml
4343
setup-python-dependencies: false
4444
- name: Perform CodeQL Analysis
45-
uses: github/codeql-action/analyze@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
45+
uses: github/codeql-action/analyze@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
4646
with:
4747
category: "/language:${{matrix.language}}"

.github/workflows/container-build.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,36 +76,36 @@ jobs:
7676
SSH_IP: ${{ secrets.ARM_SSH_IP }}
7777
SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
7878
- name: Setup Buildx
79-
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
79+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
8080
if: startsWith(inputs.CACHE_SUFFIX, 'arm') == false
8181
- name: Setup Buildx (ARM)
82-
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
82+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
8383
if: startsWith(inputs.CACHE_SUFFIX, 'arm')
8484
with:
8585
endpoint: ssh://root@arm
8686
platforms: linux/arm64,linux/arm/v7
8787
- name: Login to Docker Hub
88-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
88+
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
8989
with:
9090
username: ${{ secrets.DOCKER_USERNAME }}
9191
password: ${{ secrets.DOCKER_TOKEN }}
9292
- name: Login to ghcr
9393
if: inputs.PUSH == true
94-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
94+
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
9595
with:
9696
registry: ghcr.io
9797
username: ${{ github.actor }}
9898
password: ${{ secrets.GITHUB_TOKEN }}
9999
# Compute metadata
100100
- name: Extract metadata
101101
id: meta
102-
uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
102+
uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
103103
with:
104104
images: bunkerity/${{ inputs.IMAGE }}
105105
# Build cached image
106106
- name: Build image
107107
if: inputs.CACHE == true
108-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
108+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
109109
with:
110110
context: .
111111
file: ${{ inputs.DOCKERFILE }}
@@ -118,7 +118,7 @@ jobs:
118118
# Build non-cached image
119119
- name: Build image
120120
if: inputs.CACHE != true
121-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
121+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
122122
with:
123123
context: .
124124
file: ${{ inputs.DOCKERFILE }}
@@ -130,7 +130,7 @@ jobs:
130130
# Check OS vulnerabilities
131131
- name: Check OS vulnerabilities
132132
if: ${{ startsWith(inputs.CACHE_SUFFIX, 'arm') == false }}
133-
uses: aquasecurity/trivy-action@b6643a29fecd7f34b3597bc6acb0a98b03d33ff8 # v0.33.1
133+
uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # v0.35.0
134134
with:
135135
vuln-type: os
136136
skip-dirs: /root/.cargo

.github/workflows/dev.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ permissions: read-all
55
on:
66
push:
77
branches: [dev]
8+
workflow_dispatch:
89

910
jobs:
1011
# Containers
@@ -188,12 +189,12 @@ jobs:
188189
to: bunkerweb-all-in-one
189190
steps:
190191
- name: Login to Docker Hub
191-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
192+
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
192193
with:
193194
username: ${{ secrets.DOCKER_USERNAME }}
194195
password: ${{ secrets.DOCKER_TOKEN }}
195196
- name: Login to ghcr
196-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
197+
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
197198
with:
198199
registry: ghcr.io
199200
username: ${{ github.actor }}

.github/workflows/doc-to-pdf.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Install chromium
2424
run: sudo apt update && sudo apt install chromium-browser
2525
- name: Install node
26-
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
26+
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
2727
with:
2828
node-version: 22
2929
- name: Install puppeteer
@@ -35,7 +35,7 @@ jobs:
3535
run: mkdocs serve -f mkdocs_print.yml & sleep 15
3636
- name: Run pdf script
3737
run: node docs/misc/pdf.js http://localhost:8000/print_page/ BunkerWeb_documentation_v${{ inputs.VERSION }}.pdf 'BunkerWeb documentation v${{ inputs.VERSION }}'
38-
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
38+
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
3939
with:
4040
name: BunkerWeb_documentation_v${{ inputs.VERSION }}.pdf
4141
path: BunkerWeb_documentation_v${{ inputs.VERSION }}.pdf

.github/workflows/linux-build.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,29 +85,29 @@ jobs:
8585
SSH_IP: ${{ secrets.ARM_SSH_IP }}
8686
SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
8787
- name: Setup Buildx
88-
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
88+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
8989
if: startsWith(env.ARCH, 'arm') == false
9090
- name: Setup Buildx (ARM)
91-
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
91+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
9292
if: startsWith(env.ARCH, 'arm') == true
9393
with:
9494
endpoint: ssh://root@arm
9595
platforms: linux/arm64,linux/arm/v7
9696
- name: Login to Docker Hub
97-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
97+
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
9898
with:
9999
username: ${{ secrets.DOCKER_USERNAME }}
100100
password: ${{ secrets.DOCKER_TOKEN }}
101101
- name: Login to ghcr
102-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
102+
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
103103
with:
104104
registry: ghcr.io
105105
username: ${{ github.actor }}
106106
password: ${{ secrets.GITHUB_TOKEN }}
107107
# Build testing package image
108108
- name: Build package image
109109
if: inputs.RELEASE == 'testing' || inputs.RELEASE == 'dev' || inputs.RELEASE == 'ui' || inputs.RELEASE == '1.5'
110-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
110+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
111111
with:
112112
context: .
113113
load: true
@@ -119,7 +119,7 @@ jobs:
119119
# Build non-testing package image
120120
- name: Build package image
121121
if: inputs.RELEASE != 'testing' && inputs.RELEASE != 'dev' && inputs.RELEASE != 'ui' && inputs.RELEASE != '1.5'
122-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
122+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
123123
with:
124124
context: .
125125
load: true
@@ -143,20 +143,20 @@ jobs:
143143
scp -r root@arm:/root/package-${{ inputs.LINUX }} ./package-${{ inputs.LINUX }}
144144
env:
145145
LARCH: ${{ env.LARCH }}
146-
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
146+
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
147147
with:
148148
name: package-${{ inputs.LINUX }}-${{ env.LARCH }}
149149
path: package-${{ inputs.LINUX }}/*.${{ inputs.PACKAGE }}
150150
# Build test image
151151
- name: Extract metadata
152152
if: inputs.TEST == true
153153
id: meta
154-
uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
154+
uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
155155
with:
156156
images: ghcr.io/bunkerity/${{ inputs.LINUX }}-tests:${{ inputs.RELEASE }}
157157
- name: Build test image
158158
if: inputs.TEST == true
159-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
159+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
160160
with:
161161
context: .
162162
file: tests/linux/Dockerfile-${{ inputs.LINUX }}

.github/workflows/push-docker.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ jobs:
3535
- name: Check out repository code
3636
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3737
- name: Login to Docker Hub
38-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
38+
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
3939
with:
4040
username: ${{ secrets.DOCKER_USERNAME }}
4141
password: ${{ secrets.DOCKER_TOKEN }}
4242
- name: Login to ghcr
43-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
43+
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
4444
with:
4545
registry: ghcr.io
4646
username: ${{ github.actor }}
@@ -68,7 +68,7 @@ jobs:
6868
SSH_IP: ${{ secrets.ARM_SSH_IP }}
6969
SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
7070
- name: Setup Buildx (ARM)
71-
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
71+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
7272
with:
7373
endpoint: ssh://root@arm
7474
platforms: linux/arm64,linux/arm/v7
@@ -82,12 +82,12 @@ jobs:
8282
# Compute metadata
8383
- name: Extract metadata
8484
id: meta
85-
uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
85+
uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
8686
with:
8787
images: bunkerity/${{ inputs.IMAGE }}
8888
# Build and push
8989
- name: Build and push
90-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
90+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
9191
with:
9292
context: .
9393
file: ${{ inputs.DOCKERFILE }}

.github/workflows/push-github.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
# Get PDF doc
2525
- name: Get documentation
2626
if: inputs.VERSION != 'testing'
27-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
27+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
2828
with:
2929
name: BunkerWeb_documentation_v${{ inputs.VERSION }}.pdf
3030
# Sanitize version (replace ~ with - for valid Git tag names)
@@ -114,10 +114,12 @@ jobs:
114114
Documentation : https://docs.bunkerweb.io/${{ inputs.VERSION }}/
115115
116116
Docker tags :
117+
- All-in-one : `bunkerity/bunkerweb-all-in-one:${{ steps.sanitize.outputs.version }}` or `ghcr.io/bunkerity/bunkerweb-all-in-one:${{ steps.sanitize.outputs.version }}`
117118
- BunkerWeb : `bunkerity/bunkerweb:${{ steps.sanitize.outputs.version }}` or `ghcr.io/bunkerity/bunkerweb:${{ steps.sanitize.outputs.version }}`
118119
- Scheduler : `bunkerity/bunkerweb-scheduler:${{ steps.sanitize.outputs.version }}` or `ghcr.io/bunkerity/bunkerweb-scheduler:${{ steps.sanitize.outputs.version }}`
119120
- Autoconf : `bunkerity/bunkerweb-autoconf:${{ steps.sanitize.outputs.version }}` or `ghcr.io/bunkerity/bunkerweb-autoconf:${{ steps.sanitize.outputs.version }}`
120121
- UI : `bunkerity/bunkerweb-ui:${{ steps.sanitize.outputs.version }}` or `ghcr.io/bunkerity/bunkerweb-ui:${{ steps.sanitize.outputs.version }}`
122+
- API : `bunkerity/bunkerweb-api:${{ steps.sanitize.outputs.version }}` or `ghcr.io/bunkerity/bunkerweb-api:${{ steps.sanitize.outputs.version }}`
121123
122124
Linux packages : https://packagecloud.io/app/bunkerity/bunkerweb/search?q=${{ inputs.VERSION }}&filter=all&dist=
123125
@@ -147,6 +149,8 @@ jobs:
147149
- Scheduler : `bunkerity/bunkerweb-scheduler:${{ steps.sanitize.outputs.version }}` or `ghcr.io/bunkerity/bunkerweb-scheduler:${{ steps.sanitize.outputs.version }}`
148150
- Autoconf : `bunkerity/bunkerweb-autoconf:${{ steps.sanitize.outputs.version }}` or `ghcr.io/bunkerity/bunkerweb-autoconf:${{ steps.sanitize.outputs.version }}`
149151
- UI : `bunkerity/bunkerweb-ui:${{ steps.sanitize.outputs.version }}` or `ghcr.io/bunkerity/bunkerweb-ui:${{ steps.sanitize.outputs.version }}`
152+
- API : `bunkerity/bunkerweb-api:${{ steps.sanitize.outputs.version }}` or `ghcr.io/bunkerity/bunkerweb-api:${{ steps.sanitize.outputs.version }}`
153+
- All-in-one : `bunkerity/bunkerweb-all-in-one:${{ steps.sanitize.outputs.version }}` or `ghcr.io/bunkerity/bunkerweb-all-in-one:${{ steps.sanitize.outputs.version }}`
150154
151155
Linux packages : https://packagecloud.io/app/bunkerity/bunkerweb/search?q=${{ inputs.VERSION }}&filter=all&dist=
152156

.github/workflows/push-packagecloud.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- name: Check out repository code
4343
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4444
- name: Install ruby
45-
uses: ruby/setup-ruby@8d27f39a5e7ad39aebbcbd1324f7af020229645c # v1.287.0
45+
uses: ruby/setup-ruby@4eb9f110bac952a8b68ecf92e3b5c7a987594ba6 # v1.292.0
4646
with:
4747
ruby-version: "3.0"
4848
- name: Install packagecloud
@@ -81,7 +81,7 @@ jobs:
8181
echo "artifact=$ARTIFACT_NAME" >> $GITHUB_OUTPUT
8282
# Download packages (single generic step)
8383
- name: Download package artifact
84-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
84+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
8585
with:
8686
name: ${{ env.ARTIFACT_NAME }}
8787
path: /tmp/${{ inputs.LINUX }}

.github/workflows/scorecards-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ jobs:
2525
results_format: sarif
2626
publish_results: true
2727
- name: "Upload SARIF results to code scanning"
28-
uses: github/codeql-action/upload-sarif@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
28+
uses: github/codeql-action/upload-sarif@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
2929
with:
3030
sarif_file: results.sarif

0 commit comments

Comments
 (0)