@@ -25,18 +25,17 @@ git merge main
2525```
2626
2727Now we need to "pin" the appropriate version of the samba-server container
28- dependency. Edit ` Dockerfile ` and change the tag part of the "FROM" line with
29- the ` quay.io/samba.org/samba-server ` image repository to use the latest
30- released samba-server tag.
28+ dependency. Ensure that you use the proper base samba-server image (default:
29+ ` quay.io/samba.org/samba-server ` ) and latest released samba-server tag.
3130
3231At this point, an optional but recommended step is to do a test build before
33- tagging. Run ` make image-build ` .
32+ tagging. Run ` make BASE_IMG_TAG=v0.7 image-build ` .
3433
3534If you are happy with the content of the ` release ` branch, tag it. Example:
3635
3736```
3837git checkout release
39- git tag -a -m 'Release v0.5 ' v0.5
38+ git tag -a -m 'Release v0.7 ' v0.7
4039```
4140
4241This creates an annotated tag. Release tags must be annotated tags.
@@ -53,18 +52,19 @@ is recommended to purge your local container engine of cached images
5352
5453Build the images from scratch. Example:
5554```
56- make image-build
55+ make BASE_IMG_TAG=v0.7 image-build
5756```
5857
5958For the image that was just built, apply a temporary pre-release tag
6059to it. Example:
6160```
62- podman tag quay.io/samba.org/samba-metrics:{latest,v0.5pre1}
61+ export IMG_TAG=v0.7
62+ podman tag quay.io/samba.org/samba-metrics:{${IMG_TAG},${IMG_TAG}pre1}
6363```
6464
6565Log into quay.io. Push the images to quay.io using the temporary tag. Example:
6666```
67- podman push quay.io/samba.org/samba-metrics:{latest,v0.5pre1 }
67+ podman push quay.io/samba.org/samba-metrics:{${IMG_TAG},${IMG_TAG}pre1 }
6868```
6969
7070Wait for the security scan to complete. There shouldn't be any issues if you
@@ -100,8 +100,8 @@ Use the following partial snippet as an example:
100100
101101Images built for this release can be obtained from the quay.io image registry.
102102
103- * By tag: quay.io/samba.org/samba-metrics:v0.5
104- * By digest: quay.io/samba.org/samba-metrics@sha256:09c867343af39b237230f94a734eacc8313f2330c7d934994522ced46b740715
103+ * By tag: quay.io/samba.org/samba-metrics:v0.7
104+ * By digest: quay.io/samba.org/samba-metrics@sha256:aaaa17c124ca310177abc00bcb9c3a0cf20e52c8728afee13cd66eb7e472b164
105105```
106106... using the image that was pushed earlier
107107
0 commit comments