From 1510af575915ee3c6608b02f2c19d15f4dbe030d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Feb 2025 08:08:05 +0000 Subject: [PATCH 1/6] deps/gha: bump actions/download-artifact from 4.1.8 to 4.1.9 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 4.1.8 to 4.1.9. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v4.1.8...v4.1.9) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/push-github.yml | 2 +- .github/workflows/push-packagecloud.yml | 4 ++-- .github/workflows/staging-delete-infra.yml | 2 +- .github/workflows/staging-tests.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/push-github.yml b/.github/workflows/push-github.yml index b79b8f3395..ecf390ba3f 100644 --- a/.github/workflows/push-github.yml +++ b/.github/workflows/push-github.yml @@ -19,7 +19,7 @@ jobs: # Get PDF doc - name: Get documentation if: inputs.VERSION != 'testing' - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 with: name: BunkerWeb_documentation_v${{ inputs.VERSION }}.pdf # Create tag diff --git a/.github/workflows/push-packagecloud.yml b/.github/workflows/push-packagecloud.yml index 2312599bec..2de9c956b8 100644 --- a/.github/workflows/push-packagecloud.yml +++ b/.github/workflows/push-packagecloud.yml @@ -48,12 +48,12 @@ jobs: - name: Install packagecloud run: gem install package_cloud # Download packages - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 if: inputs.LINUX != 'el' && inputs.LINUX != 'el9' with: name: package-${{ inputs.LINUX }}-${{ inputs.PACKAGE_ARCH }} path: /tmp/${{ inputs.LINUX }} - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 if: inputs.LINUX == 'el' || inputs.LINUX == 'el9' with: name: package-rh${{ inputs.LINUX }}-${{ inputs.PACKAGE_ARCH }} diff --git a/.github/workflows/staging-delete-infra.yml b/.github/workflows/staging-delete-infra.yml index 111edb6a94..3200f322b7 100644 --- a/.github/workflows/staging-delete-infra.yml +++ b/.github/workflows/staging-delete-infra.yml @@ -23,7 +23,7 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Install terraform uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2 - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 with: name: tf-${{ inputs.TYPE }} path: /tmp diff --git a/.github/workflows/staging-tests.yml b/.github/workflows/staging-tests.yml index 66a2329d3f..b587ca6f14 100644 --- a/.github/workflows/staging-tests.yml +++ b/.github/workflows/staging-tests.yml @@ -43,7 +43,7 @@ jobs: - name: Install Terraform uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2 if: inputs.TYPE == 'k8s' - - uses: actions/download-artifact@v4.1.8 + - uses: actions/download-artifact@v4.1.9 with: name: tf-k8s path: /tmp From 53dac7848a37d35796ce87730c574b9ba82b1795 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Feb 2025 08:08:10 +0000 Subject: [PATCH 2/6] deps/gha: bump nick-fields/retry from 3.0.1 to 3.0.2 Bumps [nick-fields/retry](https://github.com/nick-fields/retry) from 3.0.1 to 3.0.2. - [Release notes](https://github.com/nick-fields/retry/releases) - [Changelog](https://github.com/nick-fields/retry/blob/master/.releaserc.js) - [Commits](https://github.com/nick-fields/retry/compare/c97818ca39074beaea45180dba704f92496a0082...ce71cc2ab81d554ebbe88c79ab5975992d79ba08) --- updated-dependencies: - dependency-name: nick-fields/retry dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/test-core-linux.yml | 2 +- .github/workflows/tests-ui-linux.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-core-linux.yml b/.github/workflows/test-core-linux.yml index 9afbb958e8..be9e4c196b 100644 --- a/.github/workflows/test-core-linux.yml +++ b/.github/workflows/test-core-linux.yml @@ -38,7 +38,7 @@ jobs: export DEBIAN_FRONTEND=noninteractive sudo -E apt install --no-install-recommends -y openssl git nodejs tar bzip2 wget curl grep libx11-xcb1 libappindicator3-1 libasound2t64 libdbus-glib-1-2 libxtst6 libxt6 php-fpm unzip firefox - name: Download geckodriver - uses: nick-fields/retry@c97818ca39074beaea45180dba704f92496a0082 # v3.0.1 + uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2 with: max_attempts: 3 timeout_minutes: 20 diff --git a/.github/workflows/tests-ui-linux.yml b/.github/workflows/tests-ui-linux.yml index 9164e20a8a..ef3acae8e7 100644 --- a/.github/workflows/tests-ui-linux.yml +++ b/.github/workflows/tests-ui-linux.yml @@ -38,7 +38,7 @@ jobs: export DEBIAN_FRONTEND=noninteractive sudo -E apt install --no-install-recommends -y openssl git nodejs tar bzip2 wget curl grep libx11-xcb1 libappindicator3-1 libasound2t64 libdbus-glib-1-2 libxtst6 libxt6 php-fpm unzip firefox - name: Download geckodriver - uses: nick-fields/retry@c97818ca39074beaea45180dba704f92496a0082 # v3.0.1 + uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2 with: max_attempts: 3 timeout_minutes: 20 From 30069a1c647217c4a33fc2685986e6f8863c9247 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Feb 2025 08:42:39 +0000 Subject: [PATCH 3/6] deps/linux: bump redhat/ubi8 from `881aaf5` to `fb25b47` in /src/linux Bumps redhat/ubi8 from `881aaf5` to `fb25b47`. --- updated-dependencies: - dependency-name: redhat/ubi8 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/linux/Dockerfile-rhel | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/linux/Dockerfile-rhel b/src/linux/Dockerfile-rhel index a330810606..ebc20af675 100644 --- a/src/linux/Dockerfile-rhel +++ b/src/linux/Dockerfile-rhel @@ -1,4 +1,4 @@ -FROM redhat/ubi8:8.10@sha256:881aaf5fa0d1f85925a1b9668a1fc7f850a11ca30fd3e37ea194db4edff892a5 AS builder +FROM redhat/ubi8:8.10@sha256:fb25b47426c1c43ef583dec35c9e3feb304caf143949e8a7e42d45e2792e6c7b AS builder ENV OS=rhel ENV NGINX_VERSION=1.26.3 @@ -64,7 +64,7 @@ COPY src/scheduler scheduler COPY src/VERSION VERSION COPY src/ui ui -FROM redhat/ubi8:8.10@sha256:881aaf5fa0d1f85925a1b9668a1fc7f850a11ca30fd3e37ea194db4edff892a5 +FROM redhat/ubi8:8.10@sha256:fb25b47426c1c43ef583dec35c9e3feb304caf143949e8a7e42d45e2792e6c7b # Set default umask to prevent huge recursive chmod increasing the final image size RUN umask 027 From 5c0700ae84dd7ba637fcaa848b6ca71028466a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Diot?= Date: Wed, 26 Feb 2025 10:55:27 +0100 Subject: [PATCH 4/6] style: Add font-family to body in overrides.css for improved typography --- src/ui/app/static/css/overrides.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/ui/app/static/css/overrides.css b/src/ui/app/static/css/overrides.css index 40e7294b1b..166d7663b6 100644 --- a/src/ui/app/static/css/overrides.css +++ b/src/ui/app/static/css/overrides.css @@ -20,6 +20,11 @@ --bs-link-hover-color-rgb: 46, 172, 104; } +body { + font-family: var(--bs-body-font-family), "Segoe UI", Roboto, "Helvetica Neue", + Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; +} + .offcanvas, .offcanvas-xxl, .offcanvas-xl, From 107a65c6aa45475be67a818ff6b7334f5cec7177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Diot?= Date: Wed, 26 Feb 2025 11:03:35 +0100 Subject: [PATCH 5/6] refactor: Change update_license_key to accept a dictionary of variables instead of a single license key --- src/ui/app/routes/pro.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ui/app/routes/pro.py b/src/ui/app/routes/pro.py index 74a8d8f356..84af7a1fba 100644 --- a/src/ui/app/routes/pro.py +++ b/src/ui/app/routes/pro.py @@ -75,9 +75,9 @@ def pro_key(): DATA.load_from_file() - def update_license_key(license_key: str): + def update_license_key(variables: dict): wait_applying() - manage_bunkerweb("global_config", {"PRO_LICENSE_KEY": license_key}, threaded=True) + manage_bunkerweb("global_config", variables, threaded=True) DATA.update( { @@ -88,7 +88,7 @@ def update_license_key(license_key: str): } ) flash("Checking license key.") - Thread(target=update_license_key, args=(license_key,)).start() + Thread(target=update_license_key, args=(variables,)).start() return redirect( url_for( "loading", From 141387e58300890088ef1d9baea0c8cbe326340b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Diot?= Date: Wed, 26 Feb 2025 11:30:44 +0100 Subject: [PATCH 6/6] feat: Add migration scripts for upgrading to version 1.6.1-rc2 with new column in bw_metadata --- ...c34a5c2c67_upgrade_to_version_1_6_1_rc2.py | 30 ++++++++++++++++++ ...0458c3e944_upgrade_to_version_1_6_1_rc2.py | 30 ++++++++++++++++++ ...0181395802_upgrade_to_version_1_6_1_rc2.py | 30 ++++++++++++++++++ ...f8fe23ccb5_upgrade_to_version_1_6_1_rc2.py | 31 +++++++++++++++++++ 4 files changed, 121 insertions(+) create mode 100644 src/common/db/alembic/mariadb_versions/b2c34a5c2c67_upgrade_to_version_1_6_1_rc2.py create mode 100644 src/common/db/alembic/mysql_versions/960458c3e944_upgrade_to_version_1_6_1_rc2.py create mode 100644 src/common/db/alembic/postgresql_versions/7a0181395802_upgrade_to_version_1_6_1_rc2.py create mode 100644 src/common/db/alembic/sqlite_versions/07f8fe23ccb5_upgrade_to_version_1_6_1_rc2.py diff --git a/src/common/db/alembic/mariadb_versions/b2c34a5c2c67_upgrade_to_version_1_6_1_rc2.py b/src/common/db/alembic/mariadb_versions/b2c34a5c2c67_upgrade_to_version_1_6_1_rc2.py new file mode 100644 index 0000000000..c2f041f436 --- /dev/null +++ b/src/common/db/alembic/mariadb_versions/b2c34a5c2c67_upgrade_to_version_1_6_1_rc2.py @@ -0,0 +1,30 @@ +"""Upgrade to version 1.6.1-rc2 + +Revision ID: b2c34a5c2c67 +Revises: 65b45de7eba5 +Create Date: 2025-02-26 10:21:41.392451 + +""" + +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + +# revision identifiers, used by Alembic. +revision: str = "b2c34a5c2c67" +down_revision: Union[str, None] = "65b45de7eba5" +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +def upgrade() -> None: + op.add_column("bw_metadata", sa.Column("reload_ui_plugins", sa.Boolean(), nullable=True)) + # Update the version in bw_metadata + op.execute("UPDATE bw_metadata SET version = '1.6.1-rc2' WHERE id = 1") + + +def downgrade() -> None: + op.drop_column("bw_metadata", "reload_ui_plugins") + # Revert the version in bw_metadata + op.execute("UPDATE bw_metadata SET version = '1.6.1-rc1' WHERE id = 1") diff --git a/src/common/db/alembic/mysql_versions/960458c3e944_upgrade_to_version_1_6_1_rc2.py b/src/common/db/alembic/mysql_versions/960458c3e944_upgrade_to_version_1_6_1_rc2.py new file mode 100644 index 0000000000..68707f6fb8 --- /dev/null +++ b/src/common/db/alembic/mysql_versions/960458c3e944_upgrade_to_version_1_6_1_rc2.py @@ -0,0 +1,30 @@ +"""Upgrade to version 1.6.1-rc2 + +Revision ID: 960458c3e944 +Revises: 0600f2ed826f +Create Date: 2025-02-26 10:23:51.088128 + +""" + +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + +# revision identifiers, used by Alembic. +revision: str = "960458c3e944" +down_revision: Union[str, None] = "0600f2ed826f" +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +def upgrade() -> None: + op.add_column("bw_metadata", sa.Column("reload_ui_plugins", sa.Boolean(), nullable=True)) + # Update the version in bw_metadata + op.execute("UPDATE bw_metadata SET version = '1.6.1-rc2' WHERE id = 1") + + +def downgrade() -> None: + op.drop_column("bw_metadata", "reload_ui_plugins") + # Revert the version in bw_metadata + op.execute("UPDATE bw_metadata SET version = '1.6.1-rc1' WHERE id = 1") diff --git a/src/common/db/alembic/postgresql_versions/7a0181395802_upgrade_to_version_1_6_1_rc2.py b/src/common/db/alembic/postgresql_versions/7a0181395802_upgrade_to_version_1_6_1_rc2.py new file mode 100644 index 0000000000..3876d1ee28 --- /dev/null +++ b/src/common/db/alembic/postgresql_versions/7a0181395802_upgrade_to_version_1_6_1_rc2.py @@ -0,0 +1,30 @@ +"""Upgrade to version 1.6.1-rc2 + +Revision ID: 7a0181395802 +Revises: 8c096ca1beb8 +Create Date: 2025-02-26 10:25:39.849523 + +""" + +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + +# revision identifiers, used by Alembic. +revision: str = "7a0181395802" +down_revision: Union[str, None] = "8c096ca1beb8" +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +def upgrade() -> None: + op.add_column("bw_metadata", sa.Column("reload_ui_plugins", sa.Boolean(), nullable=True)) + # Update the version in bw_metadata + op.execute("UPDATE bw_metadata SET version = '1.6.1-rc2' WHERE id = 1") + + +def downgrade() -> None: + op.drop_column("bw_metadata", "reload_ui_plugins") + # Revert the version in bw_metadata + op.execute("UPDATE bw_metadata SET version = '1.6.1-rc1' WHERE id = 1") diff --git a/src/common/db/alembic/sqlite_versions/07f8fe23ccb5_upgrade_to_version_1_6_1_rc2.py b/src/common/db/alembic/sqlite_versions/07f8fe23ccb5_upgrade_to_version_1_6_1_rc2.py new file mode 100644 index 0000000000..a629c30d2f --- /dev/null +++ b/src/common/db/alembic/sqlite_versions/07f8fe23ccb5_upgrade_to_version_1_6_1_rc2.py @@ -0,0 +1,31 @@ +"""Upgrade to version 1.6.1-rc2 + +Revision ID: 07f8fe23ccb5 +Revises: 864a1dbd2430 +Create Date: 2025-02-26 10:20:28.081873 + +""" + +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision: str = "07f8fe23ccb5" +down_revision: Union[str, None] = "864a1dbd2430" +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +def upgrade() -> None: + op.add_column("bw_metadata", sa.Column("reload_ui_plugins", sa.Boolean(), nullable=True)) + # Update the version in bw_metadata + op.execute("UPDATE bw_metadata SET version = '1.6.1-rc2' WHERE id = 1") + + +def downgrade() -> None: + op.drop_column("bw_metadata", "reload_ui_plugins") + # Revert the version in bw_metadata + op.execute("UPDATE bw_metadata SET version = '1.6.1-rc1' WHERE id = 1")