From 7ebadb5d41dea65b166e0044afc7f44a258eb12e Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <anders@zulip.com>
Date: Tue, 30 Sep 2025 16:09:25 -0700
Subject: [PATCH] release-checklist: Prescribe docker build --pull.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
---
 Dockerfile-postgresql                | 2 +-
 docs/subsystems/release-checklist.md | 4 ++--
 tools/ci/Dockerfile.prod             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile-postgresql b/Dockerfile-postgresql
index dc96a117c7..b109fa9758 100644
--- a/Dockerfile-postgresql
+++ b/Dockerfile-postgresql
@@ -4,7 +4,7 @@
 #     docker buildx create --name multiarch --use
 #
 # To build:
-#     docker buildx build --platform linux/amd64,linux/arm64 \
+#     docker buildx build --pull --platform linux/amd64,linux/arm64 \
 #       -f ./Dockerfile-postgresql -t zulip/zulip-postgresql:14 --push .
 
 # Currently the PostgreSQL images do not support automatic upgrading of
diff --git a/docs/subsystems/release-checklist.md b/docs/subsystems/release-checklist.md
index a581d46afd..98ca2c2585 100644
--- a/docs/subsystems/release-checklist.md
+++ b/docs/subsystems/release-checklist.md
@@ -72,7 +72,7 @@ preparing a new release.
     - Update the `tag` in `kubernetes/chart/zulip/values.yaml`
     - Update the docs by running `helm-docs`
     - Update the `image` in `kubernetes/manual/zulip-rc.yml`
-  - Build the image: `docker build . -t zulip/docker-zulip:4.11-0 --no-cache`
+  - Build the image: `docker build --pull . -t zulip/docker-zulip:4.11-0 --no-cache`
   - Also tag it with `latest`: `docker build . -t zulip/docker-zulip:latest`
   - Push those tags: `docker push zulip/docker-zulip:4.11-0; docker push zulip/docker-zulip:latest`
   - Push the commits to `main`.
@@ -106,7 +106,7 @@ preparing a new release.
     this component" on the Django release branch component.
   - In Weblate, remove the previous stable components.
   - Add a new CI production upgrade target:
-    - Build a docker image: `cd tools/ci && docker build . -f Dockerfile.prod --build-arg=BASE_IMAGE=zulip/ci:bookworm --build-arg=VERSION=7.0 --tag=zulip/ci:bookworm-7.0 && docker push zulip/ci:bookworm-7.0`
+    - Build a docker image: `cd tools/ci && docker build --pull . -f Dockerfile.prod --build-arg=BASE_IMAGE=zulip/ci:bookworm --build-arg=VERSION=7.0 --tag=zulip/ci:bookworm-7.0 && docker push zulip/ci:bookworm-7.0`
     - Add a new line to the `production_upgrade` matrix in
       `.github/workflows/production-suite.yml`.
   - Update /history page in `templates/corporate/history.md`.
diff --git a/tools/ci/Dockerfile.prod b/tools/ci/Dockerfile.prod
index 8f5deec61e..6fa4f9fd34 100644
--- a/tools/ci/Dockerfile.prod
+++ b/tools/ci/Dockerfile.prod
@@ -1,6 +1,6 @@
 # To build these production upgrade test images, say an Debian 12 Bookworm system
 # preinstalled with Zulip 7.0:
-#   docker build . -f Dockerfile.prod \
+#   docker build --pull . -f Dockerfile.prod \
 #     --build-arg=BASE_IMAGE=zulip/ci:bookworm \
 #     --build-arg=VERSION=7.0 \
 #     --tag=zulip/ci:bookworm-7.0