Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions .github/workflows/build-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Sanitize branch name
run: echo "SAFE_REF=${GITHUB_REF_NAME//\//-}" >> $GITHUB_ENV

- name: Build container
uses: docker/build-push-action@v6
with:
Expand All @@ -65,8 +68,8 @@ jobs:
tags: "${{ env.GHCR_REPO }}:${{ github.sha }}-${{ matrix.tag }}"
cache-from: |
type=registry,ref=${{ env.GHCR_REPO }}:cache-${{ matrix.tag }}
type=registry,ref=${{ env.GHCR_REPO }}:cache-${{ matrix.tag }}-${{ github.ref_name }}
cache-to: type=registry,mode=max,ref=${{ env.GHCR_REPO }}:cache-${{ matrix.tag }}-${{ github.ref_name }}
type=registry,ref=${{ env.GHCR_REPO }}:cache-${{ matrix.tag }}-${{ env.SAFE_REF }}
cache-to: type=registry,mode=max,ref=${{ env.GHCR_REPO }}:cache-${{ matrix.tag }}-${{ env.SAFE_REF }}

- name: Scan image with Trivy
uses: aquasecurity/trivy-action@0.32.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jobs:
- name: Install Rust stable
uses: actions-rs/toolchain@v1
with:
toolchain: stable
toolchain: 1.89.0
target: ${{ matrix.target }}
override: true

Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/defguard_common/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "defguard_common"
version = "1.5.0"
version = "1.5.1"
edition.workspace = true
license-file.workspace = true
homepage.workspace = true
Expand Down
5 changes: 1 addition & 4 deletions crates/defguard_core/src/handlers/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,7 @@ pub async fn patch_settings(
context: ApiRequestContext,
Json(data): Json<SettingsPatch>,
) -> ApiResult {
debug!(
"Admin {} patching settings with {data:?}",
session.user.username
);
debug!("Admin {} patching settings", session.user.username);
let mut settings = Settings::get_current_settings();
// prepare clone for emitting an event
let before = settings.clone();
Expand Down