diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2022-12-07 10:36:21 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2022-12-08 09:15:03 +0100 |
| commit | 633fff5c5834766acd14ac4fbd8c39db60ce97ea (patch) | |
| tree | d2b814164f8ef16a6d574ec72053487c70b0c9b1 | |
| parent | 2e49bd12d70f9b8f4423ddc155e95895631d0716 (diff) | |
| download | mullvadvpn-633fff5c5834766acd14ac4fbd8c39db60ce97ea.tar.xz mullvadvpn-633fff5c5834766acd14ac4fbd8c39db60ce97ea.zip | |
Update container documentation with who updates the image name files
| -rw-r--r-- | building/README.md | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/building/README.md b/building/README.md index fba50852cb..44efb65199 100644 --- a/building/README.md +++ b/building/README.md @@ -22,15 +22,19 @@ docker: sigstore-staging: file://${repo}/building/sigstore ``` -Build and publish the container image. Tag it with the github hash of the current commit +Build and publish the container image. Tag it with the github hash of the current commit. +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. ``` -git checkout -b update-build-container - ./build-and-publish-container-image.sh (linux|android) - -git push # And create a PR +git push # Pushes the new sigstore entry ``` +When satisfied with how the new image works, the `building/{linux,android}-container-image.txt` +files can be updated to point to the new image. The tag name of the new image is in the +commit message for the signed commit where the build server added the sigstore files. +This update is usually done in a separate PR by a developer + ## Building and publishing a development image container image These instructions describe how to set up a development machine to build, sign and publish container |