Skip to content

Commit 9ad3feb

Browse files
TheophileDiotTheophileDiot
authored
Merge pull request #3608 from bunkerity/dev
Merge branch "dev" into branch "staging"
2 parents dda8020 + 3412a02 commit 9ad3feb

885 files changed

Lines changed: 7623 additions & 265767 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.11~rc1
54+
value: 1.6.12~rc1
5555
validations:
5656
required: true
5757
- type: dropdown

‎.github/workflows/beta.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,16 @@ jobs:
115115
rhel-8,
116116
rhel-9,
117117
rhel-10,
118+
ubuntu-noble,
118119
ubuntu-jammy,
119120
]
120121
platforms: [linux/amd64, linux/arm64]
121122
include:
122123
- release: beta
123124
- linux: ubuntu
124125
package: deb
126+
- linux: ubuntu-noble
127+
package: deb
125128
- linux: debian-bookworm
126129
package: deb
127130
- linux: debian-trixie
@@ -234,13 +237,19 @@ jobs:
234237
el-8,
235238
el-9,
236239
el-10,
240+
ubuntu-noble,
237241
ubuntu-jammy,
238242
]
239243
arch: [amd64, arm64]
240244
include:
241245
- release: beta
242246
repo: bunkerweb
243247
- linux: ubuntu
248+
separator: _
249+
suffix: ""
250+
version: resolute
251+
package: deb
252+
- linux: ubuntu-noble
244253
separator: _
245254
suffix: ""
246255
version: noble
@@ -288,6 +297,9 @@ jobs:
288297
- linux: ubuntu
289298
arch: amd64
290299
package_arch: amd64
300+
- linux: ubuntu-noble
301+
arch: amd64
302+
package_arch: amd64
291303
- linux: debian-bookworm
292304
arch: amd64
293305
package_arch: amd64
@@ -315,6 +327,9 @@ jobs:
315327
- linux: ubuntu
316328
arch: arm64
317329
package_arch: arm64
330+
- linux: ubuntu-noble
331+
arch: arm64
332+
package_arch: arm64
318333
- linux: debian-bookworm
319334
arch: arm64
320335
package_arch: arm64

‎.github/workflows/dev.yml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,14 @@ jobs:
5858
rhel-8,
5959
rhel-9,
6060
rhel-10,
61+
ubuntu-noble,
6162
ubuntu-jammy,
6263
]
6364
include:
6465
- linux: ubuntu
6566
package: deb
67+
- linux: ubuntu-noble
68+
package: deb
6669
- linux: ubuntu-jammy
6770
package: deb
6871
- linux: debian-bookworm
@@ -218,6 +221,7 @@ jobs:
218221
el-8,
219222
el-9,
220223
el-10,
224+
ubuntu-noble,
221225
ubuntu-jammy,
222226
]
223227
arch: [amd64]
@@ -228,7 +232,7 @@ jobs:
228232
package_arch: amd64
229233
separator: _
230234
suffix: ""
231-
version: noble
235+
version: resolute
232236
package: deb
233237
- linux: debian-bookworm
234238
package_arch: amd64
@@ -272,6 +276,12 @@ jobs:
272276
suffix: "1."
273277
version: 10
274278
package: rpm
279+
- linux: ubuntu-noble
280+
package_arch: amd64
281+
separator: _
282+
suffix: ""
283+
version: noble
284+
package: deb
275285
- linux: ubuntu-jammy
276286
package_arch: amd64
277287
separator: _

‎.github/workflows/push-github.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,18 @@ jobs:
1616
steps:
1717
# Checkout
1818
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
19+
# Pin the install script default to the testing channel before checksum/upload,
20+
# so a script downloaded from the Testing release defaults to the testing version
21+
# instead of the hardcoded stable one. Must run BEFORE the checksum step.
22+
- name: Pin install script default to testing
23+
if: inputs.VERSION == 'testing'
24+
run: |
25+
# Fail loudly if the declaration is missing or duplicated, so a future
26+
# refactor cannot let sed silently rewrite the wrong/extra line.
27+
count=$(grep -cE '^DEFAULT_BUNKERWEB_VERSION="' misc/install-bunkerweb.sh)
28+
[ "$count" = "1" ] || { echo "expected exactly 1 DEFAULT_BUNKERWEB_VERSION line, found $count"; exit 1; }
29+
sed -i -E 's/^DEFAULT_BUNKERWEB_VERSION=".*"/DEFAULT_BUNKERWEB_VERSION="testing"/' misc/install-bunkerweb.sh
30+
grep -q '^DEFAULT_BUNKERWEB_VERSION="testing"$' misc/install-bunkerweb.sh
1931
# Generate checksum for install script
2032
- name: Generate checksum for install script
2133
run: |

‎.github/workflows/rc.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,16 @@ jobs:
115115
rhel-8,
116116
rhel-9,
117117
rhel-10,
118+
ubuntu-noble,
118119
ubuntu-jammy,
119120
]
120121
platforms: [linux/amd64, linux/arm64]
121122
include:
122123
- release: rc
123124
- linux: ubuntu
124125
package: deb
126+
- linux: ubuntu-noble
127+
package: deb
125128
- linux: debian-bookworm
126129
package: deb
127130
- linux: debian-trixie
@@ -238,13 +241,19 @@ jobs:
238241
el-8,
239242
el-9,
240243
el-10,
244+
ubuntu-noble,
241245
ubuntu-jammy,
242246
]
243247
arch: [amd64, arm64]
244248
include:
245249
- release: latest
246250
repo: bunkerweb
247251
- linux: ubuntu
252+
separator: _
253+
suffix: ""
254+
version: resolute
255+
package: deb
256+
- linux: ubuntu-noble
248257
separator: _
249258
suffix: ""
250259
version: noble
@@ -292,6 +301,9 @@ jobs:
292301
- linux: ubuntu
293302
arch: amd64
294303
package_arch: amd64
304+
- linux: ubuntu-noble
305+
arch: amd64
306+
package_arch: amd64
295307
- linux: debian-bookworm
296308
arch: amd64
297309
package_arch: amd64
@@ -319,6 +331,9 @@ jobs:
319331
- linux: ubuntu
320332
arch: arm64
321333
package_arch: arm64
334+
- linux: ubuntu-noble
335+
arch: arm64
336+
package_arch: arm64
322337
- linux: debian-bookworm
323338
arch: arm64
324339
package_arch: arm64

‎.github/workflows/release.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,16 @@ jobs:
125125
rhel-8,
126126
rhel-9,
127127
rhel-10,
128+
ubuntu-noble,
128129
ubuntu-jammy,
129130
]
130131
platforms: [linux/amd64, linux/arm64]
131132
include:
132133
- release: latest
133134
- linux: ubuntu
134135
package: deb
136+
- linux: ubuntu-noble
137+
package: deb
135138
- linux: debian-bookworm
136139
package: deb
137140
- linux: debian-trixie
@@ -244,13 +247,19 @@ jobs:
244247
el-8,
245248
el-9,
246249
el-10,
250+
ubuntu-noble,
247251
ubuntu-jammy,
248252
]
249253
arch: [amd64, arm64]
250254
include:
251255
- release: latest
252256
repo: bunkerweb
253257
- linux: ubuntu
258+
separator: _
259+
suffix: ""
260+
version: resolute
261+
package: deb
262+
- linux: ubuntu-noble
254263
separator: _
255264
suffix: ""
256265
version: noble
@@ -298,6 +307,9 @@ jobs:
298307
- linux: ubuntu
299308
arch: amd64
300309
package_arch: amd64
310+
- linux: ubuntu-noble
311+
arch: amd64
312+
package_arch: amd64
301313
- linux: debian-bookworm
302314
arch: amd64
303315
package_arch: amd64
@@ -325,6 +337,9 @@ jobs:
325337
- linux: ubuntu
326338
arch: arm64
327339
package_arch: arm64
340+
- linux: ubuntu-noble
341+
arch: arm64
342+
package_arch: arm64
328343
- linux: debian-bookworm
329344
arch: arm64
330345
package_arch: arm64

‎.github/workflows/staging-tests.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@ jobs:
9696
- name: Pull BW linux rhel-10 test image
9797
if: inputs.TYPE == 'linux'
9898
run: docker pull ghcr.io/bunkerity/rhel-10-tests:testing && docker tag ghcr.io/bunkerity/rhel-10-tests:testing local/rhel-10:latest
99+
- name: Pull BW linux ubuntu noble test image
100+
if: inputs.TYPE == 'linux'
101+
run: docker pull ghcr.io/bunkerity/ubuntu-noble-tests:testing && docker tag ghcr.io/bunkerity/ubuntu-noble-tests:testing local/ubuntu-noble:latest
99102
- name: Pull BW linux ubuntu jammy test image
100103
if: inputs.TYPE == 'linux'
101104
run: docker pull ghcr.io/bunkerity/ubuntu-jammy-tests:testing && docker tag ghcr.io/bunkerity/ubuntu-jammy-tests:testing local/ubuntu-jammy:latest
@@ -169,6 +172,12 @@ jobs:
169172
env:
170173
TEST_DOMAINS: ${{ secrets.TEST_DOMAINS_LINUX }}
171174
ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }}
175+
- name: Run Linux ubuntu-noble tests
176+
if: inputs.TYPE == 'linux'
177+
run: export $(echo "$TEST_DOMAINS" | xargs) && chmod +x ./tests/main.py && ./tests/main.py "linux" "ubuntu-noble"
178+
env:
179+
TEST_DOMAINS: ${{ secrets.TEST_DOMAINS_LINUX }}
180+
ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }}
172181
- name: Run Linux ubuntu-jammy tests
173182
if: inputs.TYPE == 'linux'
174183
run: export $(echo "$TEST_DOMAINS" | xargs) && chmod +x ./tests/main.py && ./tests/main.py "linux" "ubuntu-jammy"

‎.github/workflows/staging.yml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ permissions: read-all
44

55
on:
66
push:
7-
branches: [staging]
7+
branches: [staging, fix-cve]
88
workflow_dispatch:
99

1010
jobs:
@@ -58,11 +58,14 @@ jobs:
5858
rhel-8,
5959
rhel-9,
6060
rhel-10,
61+
ubuntu-noble,
6162
ubuntu-jammy,
6263
]
6364
include:
6465
- linux: ubuntu
6566
package: deb
67+
- linux: ubuntu-noble
68+
package: deb
6669
- linux: debian-bookworm
6770
package: deb
6871
- linux: debian-trixie
@@ -191,13 +194,20 @@ jobs:
191194
el-8,
192195
el-9,
193196
el-10,
197+
ubuntu-noble,
194198
ubuntu-jammy,
195199
]
196200
arch: [amd64]
197201
include:
198202
- release: testing
199203
repo: bunkerweb
200204
- linux: ubuntu
205+
package_arch: amd64
206+
separator: _
207+
suffix: ""
208+
version: resolute
209+
package: deb
210+
- linux: ubuntu-noble
201211
package_arch: amd64
202212
separator: _
203213
suffix: ""

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
curl https://nginx.org/keys/nginx_signing.key | gpg --dearmor | sudo tee /usr/share/keyrings/nginx-archive-keyring.gpg >/dev/null
7777
echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] http://nginx.org/packages/ubuntu `lsb_release -cs` nginx" | sudo tee /etc/apt/sources.list.d/nginx.list
7878
sudo apt update
79-
sudo -E apt install -y nginx=1.30.0-1~noble
79+
sudo -E apt install -y nginx=1.30.2-1~noble
8080
- name: Fix version without a starting number
8181
if: inputs.RELEASE == 'testing' || inputs.RELEASE == 'dev' || inputs.RELEASE == '1.5'
8282
run: echo "force-bad-version" | sudo tee -a /etc/dpkg/dpkg.cfg

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
curl https://nginx.org/keys/nginx_signing.key | gpg --dearmor | sudo tee /usr/share/keyrings/nginx-archive-keyring.gpg >/dev/null
7777
echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] http://nginx.org/packages/ubuntu `lsb_release -cs` nginx" | sudo tee /etc/apt/sources.list.d/nginx.list
7878
sudo apt update
79-
sudo -E apt install -y nginx=1.30.0-1~noble
79+
sudo -E apt install -y nginx=1.30.2-1~noble
8080
- name: Fix version without a starting number
8181
if: inputs.RELEASE == 'testing' || inputs.RELEASE == 'dev' || inputs.RELEASE == 'ui' || inputs.RELEASE == '1.5'
8282
run: echo "force-bad-version" | sudo tee -a /etc/dpkg/dpkg.cfg

0 commit comments

Comments
 (0)