From 84365aff7761b7b1cbb0b6cf8e37da0fc33177ad Mon Sep 17 00:00:00 2001
From: Mark Garratt <github@0g7.uk>
Date: Fri, 26 Jun 2026 10:23:44 +0100
Subject: [PATCH 1/2] proton-bridge: update to v3.25.0

Bump pinned upstream from v3.22.0 to v3.25.0 (latest stable).
Builds cleanly on arm64 against the existing Alpine 3.23 toolchain;
no Dockerfile changes required.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 images/proton-bridge/README.md  | 4 ++--
 images/proton-bridge/image.toml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/images/proton-bridge/README.md b/images/proton-bridge/README.md
index 8d1f2bb..5674f65 100644
--- a/images/proton-bridge/README.md
+++ b/images/proton-bridge/README.md
@@ -101,8 +101,8 @@ This image distributes GPL-licensed Proton Bridge binaries built from source. Co
 
 Pinned upstream source for this image definition (`images/proton-bridge/image.toml`):
 
-- `ENV_PROTONMAIL_BRIDGE_VERSION=v3.22.0`
-- `ENV_PROTONMAIL_BRIDGE_COMMIT=87bba395d0f93301ac318d9b5cffde3312bbe13e`
+- `ENV_PROTONMAIL_BRIDGE_VERSION=v3.25.0`
+- `ENV_PROTONMAIL_BRIDGE_COMMIT=f1f599e97167265cb0d10ad3d169269c324d9cc7`
 
 For published images, the wrapper source commit is recorded in image label:
 
diff --git a/images/proton-bridge/image.toml b/images/proton-bridge/image.toml
index 5f5d6dc..356ba08 100644
--- a/images/proton-bridge/image.toml
+++ b/images/proton-bridge/image.toml
@@ -1,4 +1,4 @@
 image = "proton-bridge"
-version = "3.22.0"
+version = "3.25.0"
 platforms = ["linux/amd64", "linux/arm64"]
-build_args = { ENV_PROTONMAIL_BRIDGE_VERSION = "v3.22.0", ENV_PROTONMAIL_BRIDGE_COMMIT = "87bba395d0f93301ac318d9b5cffde3312bbe13e" }
+build_args = { ENV_PROTONMAIL_BRIDGE_VERSION = "v3.25.0", ENV_PROTONMAIL_BRIDGE_COMMIT = "f1f599e97167265cb0d10ad3d169269c324d9cc7" }

From c14ddcbfd6617fa6cd6e3fd7e9fcefef6670ed0e Mon Sep 17 00:00:00 2001
From: Mark Garratt <github@0g7.uk>
Date: Fri, 26 Jun 2026 10:27:47 +0100
Subject: [PATCH 2/2] deps: bump Alpine 3.24, dockerfile 1.25, lint tools

- proton-bridge: Alpine base + golang variant 3.23 -> 3.24 (3.24.1);
  builds clean on arm64, bridge binary runs.
- proton-bridge: dockerfile frontend syntax 1.7 -> 1.25; drop now-redundant
  --platform=$TARGETPLATFORM on FROM (frontend flags it as default).
- mise: shellcheck 0.10.0 -> 0.11.0, hadolint 2.12.0 -> 2.14.0,
  jq 1.7.1 -> 1.8.2. lint.sh stays clean.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 images/proton-bridge/Dockerfile | 6 +++---
 mise.toml                       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/images/proton-bridge/Dockerfile b/images/proton-bridge/Dockerfile
index c43e4b2..982e9d5 100644
--- a/images/proton-bridge/Dockerfile
+++ b/images/proton-bridge/Dockerfile
@@ -1,6 +1,6 @@
-# syntax=docker/dockerfile:1.7
+# syntax=docker/dockerfile:1.25
 
-FROM --platform=$TARGETPLATFORM golang:alpine3.23 AS build
+FROM golang:alpine3.24 AS build
 
 ARG ENV_PROTONMAIL_BRIDGE_VERSION
 ARG ENV_PROTONMAIL_BRIDGE_COMMIT
@@ -40,7 +40,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \
     make build-nogui vault-editor
 
 # Working stage image
-FROM --platform=$TARGETPLATFORM alpine:3.23
+FROM alpine:3.24
 
 # Define arguments and env variables
 ARG TARGETPLATFORM
diff --git a/mise.toml b/mise.toml
index 894a37b..7455373 100644
--- a/mise.toml
+++ b/mise.toml
@@ -1,6 +1,6 @@
 [tools]
 node = "lts"
 python = "3.12"
-shellcheck = "0.10.0"
-hadolint = "2.12.0"
-jq = "1.7.1"
+shellcheck = "0.11.0"
+hadolint = "2.14.0"
+jq = "1.8.2"