summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2024-10-03 17:25:02 +0200
committerLinus Färnstrand <linus@mullvad.net>2024-10-03 17:25:02 +0200
commitb6bb6b5ba7a1c6172b2f7cf5a98841a19c5cd092 (patch)
treeb337ef26b43794acd2d3765caa281f4099a9f0d6
parent068b7c7fdcef6da66737a30894a0dbdbcfbd2b91 (diff)
parent22fe59feb6361b226ed1367e7bf9fa49ad7d9e61 (diff)
downloadmullvadvpn-b6bb6b5ba7a1c6172b2f7cf5a98841a19c5cd092.tar.xz
mullvadvpn-b6bb6b5ba7a1c6172b2f7cf5a98841a19c5cd092.zip
Merge branch 'bump-android-container-base-and-build'
-rw-r--r--android/docker/Dockerfile2
-rw-r--r--building/android-container-image.txt2
-rw-r--r--building/sigstore/mullvad/mullvadvpn-app-build-android@sha256=31497baaf56b36080d51afbcbc32522f3c05a8f116a70f76b9522f9630a5bbb7/signature-13
-rw-r--r--building/sigstore/mullvad/mullvadvpn-app-build-android@sha256=31497baaf56b36080d51afbcbc32522f3c05a8f116a70f76b9522f9630a5bbb7/signature-2bin0 -> 403 bytes
4 files changed, 5 insertions, 2 deletions
diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile
index 79c237b397..bfe95668be 100644
--- a/android/docker/Dockerfile
+++ b/android/docker/Dockerfile
@@ -19,7 +19,7 @@
# patch for a given go version can be identified by checking the wireguard-android
# repo: https://git.zx2c4.com/wireguard-android/tree/tunnel/tools/libwg-go.
# It's also important to keep the go path in sync.
-FROM ghcr.io/mullvad/mullvadvpn-app-build:0186b645c
+FROM ghcr.io/mullvad/mullvadvpn-app-build:2301dbd5b
# === Metadata ===
LABEL org.opencontainers.image.source=https://github.com/mullvad/mullvadvpn-app
diff --git a/building/android-container-image.txt b/building/android-container-image.txt
index 2b2c1042c1..0f1f220ce4 100644
--- a/building/android-container-image.txt
+++ b/building/android-container-image.txt
@@ -1 +1 @@
-ghcr.io/mullvad/mullvadvpn-app-build-android:c5db11836
+ghcr.io/mullvad/mullvadvpn-app-build-android:7b6bc0f44
diff --git a/building/sigstore/mullvad/mullvadvpn-app-build-android@sha256=31497baaf56b36080d51afbcbc32522f3c05a8f116a70f76b9522f9630a5bbb7/signature-1 b/building/sigstore/mullvad/mullvadvpn-app-build-android@sha256=31497baaf56b36080d51afbcbc32522f3c05a8f116a70f76b9522f9630a5bbb7/signature-1
new file mode 100644
index 0000000000..bd00024bda
--- /dev/null
+++ b/building/sigstore/mullvad/mullvadvpn-app-build-android@sha256=31497baaf56b36080d51afbcbc32522f3c05a8f116a70f76b9522f9630a5bbb7/signature-1
@@ -0,0 +1,3 @@
+%v`}˗DOIbHjgRrQfIfrbURfJj^IfI%Z[Zd\[S
+t
+tJ3sRtR3S̓̒ LLju2sSLMLK-.MLR@3Lͬ M,͓L͒ , RL ӒLҌ L-  ͒,AfIII J* @M,LVH+IK-R(LK,)-J)/(σx;(TT@ hTf.yJVFf, b\ b,rbo(tLeied8p2Buۧq'8-er!6K {?z76HubչM{ \ No newline at end of file
diff --git a/building/sigstore/mullvad/mullvadvpn-app-build-android@sha256=31497baaf56b36080d51afbcbc32522f3c05a8f116a70f76b9522f9630a5bbb7/signature-2 b/building/sigstore/mullvad/mullvadvpn-app-build-android@sha256=31497baaf56b36080d51afbcbc32522f3c05a8f116a70f76b9522f9630a5bbb7/signature-2
new file mode 100644
index 0000000000..0a7cbad663
--- /dev/null
+++ b/building/sigstore/mullvad/mullvadvpn-app-build-android@sha256=31497baaf56b36080d51afbcbc32522f3c05a8f116a70f76b9522f9630a5bbb7/signature-2
Binary files differ