Skip to content

Commit 0f0c737

Browse files
TheophileDiotTheophileDiot
authored
Merge pull request #1955 from bunkerity/dev
Merge branch "dev" into branch "staging"
2 parents d7314be + f2cff54 commit 0f0c737

File tree

397 files changed

+1826
-3343
lines changed

Some content is hidden

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

397 files changed

+1826
-3343
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ body:
4747
label: BunkerWeb version
4848
description: What version of BunkerWeb are you running?
4949
placeholder: Version
50-
value: 1.6.0-rc3
50+
value: 1.6.0-rc4
5151
validations:
5252
required: true
5353
- type: dropdown

‎.github/workflows/codeql.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Checkout repository
2222
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2323
- name: Set up Python 3.9
24-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
24+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
2525
if: matrix.language == 'python'
2626
with:
2727
python-version: "3.9"
@@ -35,12 +35,12 @@ jobs:
3535
python -m pip install --no-cache-dir --require-hashes -r src/common/db/requirements.txt
3636
echo "CODEQL_PYTHON=$(which python)" >> $GITHUB_ENV
3737
- name: Initialize CodeQL
38-
uses: github/codeql-action/init@ee117c905ab18f32fa0f66c2fe40ecc8013f3e04 # v3.28.4
38+
uses: github/codeql-action/init@17a820bf2e43b47be2c72b39cc905417bc1ab6d0 # v3.28.6
3939
with:
4040
languages: ${{ matrix.language }}
4141
config-file: ./.github/codeql.yml
4242
setup-python-dependencies: false
4343
- name: Perform CodeQL Analysis
44-
uses: github/codeql-action/analyze@ee117c905ab18f32fa0f66c2fe40ecc8013f3e04 # v3.28.4
44+
uses: github/codeql-action/analyze@17a820bf2e43b47be2c72b39cc905417bc1ab6d0 # v3.28.6
4545
with:
4646
category: "/language:${{matrix.language}}"

‎.github/workflows/container-build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
# Build cached image
9696
- name: Build image
9797
if: inputs.CACHE == true
98-
uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d # v6.12.0
98+
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
9999
with:
100100
context: .
101101
file: ${{ inputs.DOCKERFILE }}
@@ -108,7 +108,7 @@ jobs:
108108
# Build non-cached image
109109
- name: Build image
110110
if: inputs.CACHE != true
111-
uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d # v6.12.0
111+
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
112112
with:
113113
context: .
114114
file: ${{ inputs.DOCKERFILE }}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ jobs:
1515
- name: Checkout source code
1616
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1717
- name: Install Python
18-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
18+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
1919
with:
2020
python-version: "3.10"
2121
- name: Install doc dependencies
2222
run: pip install --no-cache-dir --require-hashes -r docs/requirements.txt && sudo apt install -y libcairo2-dev libfreetype6-dev libffi-dev libjpeg-dev libpng-dev libz-dev
2323
- name: Install chromium
2424
run: sudo apt install chromium-browser
2525
- name: Install node
26-
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
26+
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
2727
with:
2828
node-version: 18
2929
- name: Install puppeteer

‎.github/workflows/linux-build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
# Build testing package image
9898
- name: Build package image
9999
if: inputs.RELEASE == 'testing' || inputs.RELEASE == 'dev' || inputs.RELEASE == 'ui' || inputs.RELEASE == '1.5'
100-
uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d # v6.12.0
100+
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
101101
with:
102102
context: .
103103
load: true
@@ -109,7 +109,7 @@ jobs:
109109
# Build non-testing package image
110110
- name: Build package image
111111
if: inputs.RELEASE != 'testing' && inputs.RELEASE != 'dev' && inputs.RELEASE != 'ui' && inputs.RELEASE != '1.5'
112-
uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d # v6.12.0
112+
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
113113
with:
114114
context: .
115115
load: true
@@ -145,7 +145,7 @@ jobs:
145145
images: ghcr.io/bunkerity/${{ inputs.LINUX }}-tests:${{ inputs.RELEASE }}
146146
- name: Build test image
147147
if: inputs.TEST == true
148-
uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d # v6.12.0
148+
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
149149
with:
150150
context: .
151151
file: tests/linux/Dockerfile-${{ inputs.LINUX }}

‎.github/workflows/push-doc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
run: |
3434
git config --global user.name "BunkerBot"
3535
git config --global user.email "[email protected]"
36-
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
36+
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
3737
with:
3838
python-version: "3.10"
3939
- name: Install doc dependencies

‎.github/workflows/push-docker.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
images: bunkerity/${{ inputs.IMAGE }}
7171
# Build and push
7272
- name: Build and push
73-
uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d # v6.12.0
73+
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
7474
with:
7575
context: .
7676
file: ${{ inputs.DOCKERFILE }}

‎.github/workflows/push-packagecloud.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- name: Check out repository code
4343
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4444
- name: Install ruby
45-
uses: ruby/setup-ruby@28c4deda893d5a96a6b2d958c5b47fc18d65c9d3 # v1.213.0
45+
uses: ruby/setup-ruby@1287d2b408066abada82d5ad1c63652e758428d9 # v1.214.0
4646
with:
4747
ruby-version: "3.0"
4848
- name: Install packagecloud

‎.github/workflows/scorecards-analysis.yml

+1-1
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@ee117c905ab18f32fa0f66c2fe40ecc8013f3e04 # v3.28.4
28+
uses: github/codeql-action/upload-sarif@17a820bf2e43b47be2c72b39cc905417bc1ab6d0 # v3.28.6
2929
with:
3030
sarif_file: results.sarif

‎.github/workflows/staging-create-infra.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
with:
3131
version: "v1.29.1"
3232
- name: Set up Python 3.12
33-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
33+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
3434
if: inputs.TYPE != 'k8s'
3535
with:
3636
python-version: "3.12"

‎.github/workflows/test-core-linux.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Checkout source code
1919
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2020
- name: Set up Python 3.12
21-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
21+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
2222
with:
2323
python-version: "3.12"
2424
- name: Install Firefox manually and dependencies

‎.github/workflows/tests-ui-linux.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Checkout source code
1919
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2020
- name: Set up Python 3.12
21-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
21+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
2222
with:
2323
python-version: "3.12"
2424
- name: Install Firefox manually and dependencies

‎CHANGELOG.md

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
# Changelog
22

3-
## v1.6.0-rc3 - ????/??/??
3+
## v1.6.0-rc4 - ????/??/??
4+
5+
- [BUGFIX] Fix shenanigans with the configuration being wiped after a restart
6+
- [BUGFIX] Fix shenanigans with cache files being deleted for no reason
7+
- [BUGFIX] Refactor condition checks in Database class to avoid default value check when a multiple has a suffix so that it still saves important values
8+
- [DOCKER] Update Dockerfiles to change user home directories and set shell to nologin for autoconf, scheduler, and ui users
9+
- [DEPS] Updated coreruleset-v4 version to v4.11.0
10+
11+
## v1.6.0-rc3 - 2025/01/26
412

513
- [FEATURE] Update BunkerNet's logic to send reports in bulk instead of one by one
614
- [AUTOCONF] Add the possibility to add/override settings via ConfigMap in Kubernetes using the `bunkerweb.io/CONFIG_TYPE=settings` annotation

0 commit comments

Comments
 (0)