Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge branch "dev' into branch "staging" #1276

Merged
merged 53 commits into from
Jun 14, 2024
Merged

Merge branch "dev' into branch "staging" #1276

Changes from 2 commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
37826bf
feat: Fix error with default value for setting_checkbox.html
TheophileDiot Jun 7, 2024
8e3dd31
chore: Update database restoration instructions for different databas…
TheophileDiot Jun 8, 2024
49494af
Update image format for BunkerWeb Cloud overview in integrations.md
TheophileDiot Jun 8, 2024
561e158
feat: Move update-check.py script into "jobs" plugin and enhance the …
TheophileDiot Jun 8, 2024
b17d45c
Update image format for BunkerWeb Cloud overview in integrations.md
TheophileDiot Jun 8, 2024
eda2997
Update SSL certificate configuration for stream server to avoid tryin…
TheophileDiot Jun 8, 2024
0dc7035
chore: Update Database.py to fix query filter for checking if a setti…
TheophileDiot Jun 8, 2024
f8b86a9
deps/gha: bump ruby/setup-ruby from 1.179.0 to 1.179.1
dependabot[bot] Jun 10, 2024
e46db21
Merge pull request #1264 from bunkerity/dependabot/github_actions/dev…
TheophileDiot Jun 10, 2024
dc9774f
chore: Update Dockerfile to use Python 3.12.4-alpine3.19
TheophileDiot Jun 10, 2024
c3a903d
chore: Improve error handling in mmdb-asn and mmdb-country scripts
TheophileDiot Jun 10, 2024
4075c95
add plugin svg for types
syrk4web Jun 10, 2024
4e3cc4c
chore: Update session and cookie configurations in web UI
TheophileDiot Jun 10, 2024
5b95542
chore: Update session and cookie configurations in web UI
TheophileDiot Jun 10, 2024
e22b901
account get current key value and disabled scheduler
syrk4web Jun 10, 2024
d08eec1
chore: Enable self-signed SSL certificate generation for UI services …
TheophileDiot Jun 10, 2024
7ab6c86
chore: Update plugin SVGs for external plugins by adding an external …
TheophileDiot Jun 10, 2024
8cf616c
deps/tests/linux: bump redhat/ubi8-init in /tests/linux
dependabot[bot] Jun 11, 2024
9ef12df
deps/gha: bump docker/build-push-action from 5.3.0 to 5.4.0
dependabot[bot] Jun 11, 2024
b56606b
chore: Refactor check_cert function to handle exceptions and improve …
TheophileDiot Jun 12, 2024
d24831f
chore: Update libmaxminddb dependency to v1.10.0
TheophileDiot Jun 12, 2024
1b0ee3e
chore: Update lua-cjson dependency to v2.1.0.14
TheophileDiot Jun 12, 2024
e66e2bb
Squashed 'src/deps/src/libmaxminddb/' changes from e26013e1d2..7acfe4…
TheophileDiot Jun 12, 2024
1974c40
Merge commit 'e66e2bb891b06aaec6f18b1676ff208f034f071d' into dev
TheophileDiot Jun 12, 2024
cdc12b2
Squashed 'src/deps/src/lua-cjson/' changes from 881accc8fa..f95cd9ea1e
TheophileDiot Jun 12, 2024
3c5d76e
Merge commit 'cdc12b239d4332a896d933cfa998fdc40b6a7aa8' into dev
TheophileDiot Jun 12, 2024
d10c0c2
Merge pull request #1266 from bunkerity/dependabot/github_actions/dev…
TheophileDiot Jun 12, 2024
f67f5f6
Merge pull request #1265 from bunkerity/dependabot/docker/tests/linux…
TheophileDiot Jun 12, 2024
95c7896
feat: Fix cookie handling for session in logs_page.py tests
TheophileDiot Jun 12, 2024
ffd0e6a
chore: Update maxminddb dependency to version 2.6.2
TheophileDiot Jun 12, 2024
0d3ae93
Add failover logic to scheduler and web UI
TheophileDiot Jun 12, 2024
5a6720e
Update CHANGELOG.md
TheophileDiot Jun 12, 2024
4bee7d1
feat: Add Event object for applying changes before stopping
TheophileDiot Jun 12, 2024
3f91758
chore: Update plugin.json files and docs with improved help text for …
TheophileDiot Jun 12, 2024
b98d2e5
deps/gha: bump ruby/setup-ruby from 1.179.1 to 1.180.0
dependabot[bot] Jun 13, 2024
b54be96
deps/gha: bump actions/checkout from 4.1.6 to 4.1.7
dependabot[bot] Jun 13, 2024
781a861
Optimize web UI DB requests and avoid skip of pro-plugins download wh…
TheophileDiot Jun 13, 2024
0aabffb
Fix shenanigans in web UI automatic tests
TheophileDiot Jun 13, 2024
8d8cc8b
chore: Fix config checks in web UI (post optimization)
TheophileDiot Jun 13, 2024
43b9f2b
deps/tests/linux: bump redhat/ubi9-init in /tests/linux
dependabot[bot] Jun 14, 2024
ccd9ab6
deps/gha: bump github/codeql-action from 3.25.8 to 3.25.10
dependabot[bot] Jun 14, 2024
2250655
deps/linux: bump redhat/ubi9 from `d31d3e5` to `d98fdae` in /src/linux
dependabot[bot] Jun 14, 2024
4803c49
Optimize and fix database config handling in general
TheophileDiot Jun 14, 2024
eb17ba2
Fix small mistake in config gathering with global_only argument being…
TheophileDiot Jun 14, 2024
15dc826
Merge pull request #1272 from bunkerity/dependabot/github_actions/dev…
TheophileDiot Jun 14, 2024
41cb958
Merge pull request #1269 from bunkerity/dependabot/github_actions/dev…
TheophileDiot Jun 14, 2024
c5c0946
Merge pull request #1268 from bunkerity/dependabot/github_actions/dev…
TheophileDiot Jun 14, 2024
819875c
Merge pull request #1273 from bunkerity/dependabot/docker/src/linux/d…
TheophileDiot Jun 14, 2024
195c880
Merge pull request #1271 from bunkerity/dependabot/docker/tests/linux…
TheophileDiot Jun 14, 2024
1c22ec3
chore: Update selenium and fix automatic web UI tests
TheophileDiot Jun 14, 2024
4850731
chore: Update redis dependency to version 5.0.6
TheophileDiot Jun 14, 2024
727244e
chore: Update requests dependency to version 2.32.3
TheophileDiot Jun 14, 2024
89abb65
chore: Refresh page after navigating to configs page so that we don't…
TheophileDiot Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/linux/Dockerfile-rhel9
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM redhat/ubi9:9.4@sha256:d31d3e5e92c0c47277c5011c0326b285ab7ae627eff036133be1dccc4208004d as builder
FROM redhat/ubi9:9.4@sha256:d98fdae16212df566150ac975cab860cd8d2cb1b322ed9966d09a13e219112e9 as builder

ENV OS=rhel
ENV NGINX_VERSION 1.26.1
Expand Down Expand Up @@ -68,7 +68,7 @@ COPY src/scheduler scheduler
COPY src/ui ui
COPY src/VERSION VERSION

FROM redhat/ubi9:9.4@sha256:d31d3e5e92c0c47277c5011c0326b285ab7ae627eff036133be1dccc4208004d
FROM redhat/ubi9:9.4@sha256:d98fdae16212df566150ac975cab860cd8d2cb1b322ed9966d09a13e219112e9

# Set default umask to prevent huge recursive chmod increasing the final image size
RUN umask 027
Expand Down
Loading