diff options
| author | Albin <albin@mullvad.net> | 2022-12-01 11:34:17 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2022-12-01 13:43:09 +0100 |
| commit | 05c2c69871f21fcead537d154a2a0acda20ac7f8 (patch) | |
| tree | b5bcb3a4b328f8f0b61c36eb95f61d8db4167a26 | |
| parent | 6efde79b1ad73f235f56c17d2753343540c3da66 (diff) | |
| download | mullvadvpn-05c2c69871f21fcead537d154a2a0acda20ac7f8.tar.xz mullvadvpn-05c2c69871f21fcead537d154a2a0acda20ac7f8.zip | |
Store full container image names rather than tags
| -rw-r--r-- | .github/workflows/android-app.yml | 3 | ||||
| -rw-r--r-- | building/android-container-image-tag.txt | 1 | ||||
| -rw-r--r-- | building/android-container-image.txt | 1 | ||||
| -rwxr-xr-x | building/build-and-publish.sh | 12 | ||||
| -rw-r--r-- | building/linux-container-image-tag.txt | 1 | ||||
| -rw-r--r-- | building/linux-container-image.txt | 1 |
6 files changed, 9 insertions, 10 deletions
diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml index 4565cb73a7..9337863549 100644 --- a/.github/workflows/android-app.yml +++ b/.github/workflows/android-app.yml @@ -45,8 +45,7 @@ jobs: - name: Use default container image and resolve digest if: "${{ github.event.inputs.override_container_image == '' }}" run: | - image_tag="$(cat ./building/android-container-image-tag.txt)" - echo "inner_container_image=ghcr.io/mullvad/mullvadvpn-app-build-android:$image_tag" >> $GITHUB_ENV + echo "inner_container_image=$(cat ./building/android-container-image.txt)" >> $GITHUB_ENV outputs: container_image: "${{ env.inner_container_image }}" diff --git a/building/android-container-image-tag.txt b/building/android-container-image-tag.txt deleted file mode 100644 index c761c91090..0000000000 --- a/building/android-container-image-tag.txt +++ /dev/null @@ -1 +0,0 @@ -8a937cfc0 diff --git a/building/android-container-image.txt b/building/android-container-image.txt new file mode 100644 index 0000000000..d6e693adc2 --- /dev/null +++ b/building/android-container-image.txt @@ -0,0 +1 @@ +ghcr.io/mullvad/mullvadvpn-app-build-android:8a937cfc0 diff --git a/building/build-and-publish.sh b/building/build-and-publish.sh index 777c644d51..5d56e9c4c2 100755 --- a/building/build-and-publish.sh +++ b/building/build-and-publish.sh @@ -23,13 +23,13 @@ case ${1-:""} in container_name="mullvadvpn-app-build" containerfile_path="$SCRIPT_DIR/Dockerfile" container_context_dir="$REPO_DIR" - container_image_tag_path="$SCRIPT_DIR/linux-container-image-tag.txt" + 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_tag_path="$SCRIPT_DIR/android-container-image-tag.txt" + container_image_name_file_path="$SCRIPT_DIR/android-container-image.txt" ;; *) log_error "Invalid platform. Specify 'linux' or 'android' as first argument" @@ -80,11 +80,11 @@ fi cp "$tmp_signature_dir/signature-2" "$signature_dir/" -log_info "Storing container tag to $container_image_tag_path" -echo "$tag" > "$container_image_tag_path" +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 tag name to git" -git add "$container_image_tag_path" "$signature_dir" +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_success "***********************" diff --git a/building/linux-container-image-tag.txt b/building/linux-container-image-tag.txt deleted file mode 100644 index 152933ef05..0000000000 --- a/building/linux-container-image-tag.txt +++ /dev/null @@ -1 +0,0 @@ -62371bb6c diff --git a/building/linux-container-image.txt b/building/linux-container-image.txt new file mode 100644 index 0000000000..92eaa86c59 --- /dev/null +++ b/building/linux-container-image.txt @@ -0,0 +1 @@ +ghcr.io/mullvad/mullvadvpn-app-build:62371bb6c |