From 7686c33cbdbdf32512933fa7aab0da921625c34a Mon Sep 17 00:00:00 2001
From: Dave Page <dpage@pgadmin.org>
Date: Fri, 13 May 2022 13:55:41 +0100
Subject: [PATCH] Tell Docker to always pull the latest base images when
 building containers.

Fixes #7372
---
 Makefile                          |  2 +-
 docs/en_US/release_notes.rst      |  1 +
 docs/en_US/release_notes_6_10.rst | 20 ++++++++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 docs/en_US/release_notes_6_10.rst

diff --git a/Makefile b/Makefile
index 7507d7acc..ca47f321c 100644
--- a/Makefile
+++ b/Makefile
@@ -122,7 +122,7 @@ debian:
 
 docker:
 	echo $(APP_NAME)
-	docker build -t ${APP_NAME} -t $(APP_NAME):latest -t $(APP_NAME):$(APP_RELEASE) -t $(APP_NAME):$(APP_RELEASE).$(APP_REVISION) .
+	docker build --pull -t ${APP_NAME} -t $(APP_NAME):latest -t $(APP_NAME):$(APP_RELEASE) -t $(APP_NAME):$(APP_RELEASE).$(APP_REVISION) .
 
 docs:
 	LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html
diff --git a/docs/en_US/release_notes.rst b/docs/en_US/release_notes.rst
index bfb7f652c..c9a85b913 100644
--- a/docs/en_US/release_notes.rst
+++ b/docs/en_US/release_notes.rst
@@ -11,6 +11,7 @@ notes for it.
 .. toctree::
    :maxdepth: 1
 
+   release_notes_6_10
    release_notes_6_9
    release_notes_6_8
    release_notes_6_7
diff --git a/docs/en_US/release_notes_6_10.rst b/docs/en_US/release_notes_6_10.rst
new file mode 100644
index 000000000..83584f2e8
--- /dev/null
+++ b/docs/en_US/release_notes_6_10.rst
@@ -0,0 +1,20 @@
+************
+Version 6.10
+************
+
+Release date: 2022-06-02
+
+This release contains a number of bug fixes and new features since the release of pgAdmin 4 v6.9.
+
+New features
+************
+
+
+Housekeeping
+************
+
+
+Bug fixes
+*********
+
+  | `Issue #7372 <https://redmine.postgresql.org/issues/7372>`_ -  Tell Docker to always pull the latest base images when building containers.