From 9e8473a58fd93f8cbd8a1b3f7044f05a45fc5214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20F=C3=A4rnstrand?= Date: Wed, 3 Jan 2024 14:40:43 +0100 Subject: [PATCH 1/2] Update container build instructions to include deploy key command --- building/README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/building/README.md b/building/README.md index 505c47f78030..856b18a690a9 100644 --- a/building/README.md +++ b/building/README.md @@ -29,8 +29,11 @@ Build and publish the container image. Tag it with the github hash of the curren This also adds the container GPG signatures to the sigstore and commits that to git. The single sigstore addition (signed) commit can be pushed directly to the main branch without PR. ``` +# Builds a new container image, pushes it to the registry, signs it and commits the signatures in git ./build-and-publish-container-image.sh (linux|android) -git push # Pushes the new sigstore entry + +# Pushes the new sigstore entry +GIT_SSH_COMMAND="ssh -i /path/to/deploy-key" git push ``` When satisfied with how the new image works, the `building/{linux,android}-container-image.txt` From f6b633a406997da21ce06913b277d4124a3a42fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20F=C3=A4rnstrand?= Date: Wed, 3 Jan 2024 14:44:08 +0100 Subject: [PATCH 2/2] Bump the Linux build container to 1b882ccbc --- building/linux-container-image.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/building/linux-container-image.txt b/building/linux-container-image.txt index b94b251735e6..f9109d941470 100644 --- a/building/linux-container-image.txt +++ b/building/linux-container-image.txt @@ -1 +1 @@ -ghcr.io/mullvad/mullvadvpn-app-build:4986f0398 +ghcr.io/mullvad/mullvadvpn-app-build:1b882ccbc