summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2022-12-07 10:28:58 +0100
committerLinus Färnstrand <linus@mullvad.net>2022-12-08 09:14:49 +0100
commitd859b5ef8fba04645a99448983ca8690f058e01d (patch)
tree6d7a1d67bde3dffb215848e955c5689242b1b7a4
parentba01f52daba959da8cc34f99a5205ff35b97ac09 (diff)
downloadmullvadvpn-d859b5ef8fba04645a99448983ca8690f058e01d.tar.xz
mullvadvpn-d859b5ef8fba04645a99448983ca8690f058e01d.zip
Don't edit the container image name files in container publishing script
-rwxr-xr-xbuilding/build-and-publish.sh11
1 files changed, 3 insertions, 8 deletions
diff --git a/building/build-and-publish.sh b/building/build-and-publish.sh
index d1d2dc275c..7220d71f30 100755
--- a/building/build-and-publish.sh
+++ b/building/build-and-publish.sh
@@ -23,13 +23,11 @@ case ${1-:""} in
container_name="mullvadvpn-app-build"
containerfile_path="$SCRIPT_DIR/Dockerfile"
container_context_dir="$REPO_DIR"
- container_image_name_file_path="$SCRIPT_DIR/linux-container-image.txt"
;;
android)
container_name="mullvadvpn-app-build-android"
containerfile_path="$REPO_DIR/android/docker/Dockerfile"
container_context_dir="$REPO_DIR/android/docker/"
- container_image_name_file_path="$SCRIPT_DIR/android-container-image.txt"
;;
*)
log_error "Invalid platform. Specify 'linux' or 'android' as first argument"
@@ -80,12 +78,9 @@ fi
cp "$tmp_signature_dir/signature-2" "$signature_dir/"
-log_info "Storing container image name to $container_image_name_file_path"
-echo "$full_container_name:$tag" > "$container_image_name_file_path"
-
-log_header "Commiting signatures and new container image name to git"
-git add "$container_image_name_file_path" "$signature_dir"
-GPG_TTY=$(tty) git commit -S -m "Updating build container for $1 to $tag"
+log_header "Commiting container sigstore signatures"
+git add "$signature_dir"
+GPG_TTY=$(tty) git commit -S -m "Add container signature for $container_name:$tag"
log_success "***********************"
log_success ""