From 7e1009a704e4011ca798209c444b5e9bf39dff4b Mon Sep 17 00:00:00 2001
From: Georgina Shippey <9370167+GeorginaShippey@users.noreply.github.com>
Date: Thu, 1 Feb 2024 16:57:53 +0000
Subject: [PATCH] Regenerate static files

---
 .github/CODEOWNERS                        | 5 +++++
 .github/pull_request_template.md          | 1 -
 static-commontooling/make/include/core.mk | 4 ++--
 static-commontooling/make/standalone.mk   | 5 ++---
 4 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 .github/CODEOWNERS

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000..93f4f74
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,5 @@
+# This is a GitHub CODEOWNERS file
+# See for more information: https://help.github.com/articles/about-codeowners/
+
+# Global Rule:
+*   @bbc/rd-apmm-cloudfit
\ No newline at end of file
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index bc46e35..9297176 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -13,7 +13,6 @@ _Where appropriate, if separate to default CI run_
 # Submitter PR Checks
 _(tick as appropriate)_
 
-- [ ] Added bbc/rd-apmm-cloudfit team as a reviewer
 - [ ] PR completes task/fixes bug
 - [ ] Tests exercise code appropriately
 - [ ] New features and API breaks are flagged in commit messages using magic strings
diff --git a/static-commontooling/make/include/core.mk b/static-commontooling/make/include/core.mk
index a17c849..07f2782 100644
--- a/static-commontooling/make/include/core.mk
+++ b/static-commontooling/make/include/core.mk
@@ -26,13 +26,13 @@ reldir=$(eval reldir := $(shell realpath --relative-to $(project_root_dir) $(top
 DEFAULT_PYTHON_VERSION:=3.10
 PYTHON_VERSION?=${DEFAULT_PYTHON_VERSION}
 ifneq "${PYTHON_VERSION}" "${DEFAULT_PYTHON_VERSION}"
-J2CLI_DOCKER_LABEL?=python${PYTHON_VERSION}
 CLOUDFIT_BASE_LABEL?=python${PYTHON_VERSION}
 else
-J2CLI_DOCKER_LABEL?=latest
 CLOUDFIT_BASE_LABEL?=latest
 endif
 
+J2CLI_DOCKER_LABEL?=latest
+
 # Set python pip config location
 ifeq "${GITHUB_ACTIONS}" "true"
 PIP_CONFIG_FILE?=$(project_root_dir)/.pip.conf
diff --git a/static-commontooling/make/standalone.mk b/static-commontooling/make/standalone.mk
index cd9fdeb..f23a1e8 100644
--- a/static-commontooling/make/standalone.mk
+++ b/static-commontooling/make/standalone.mk
@@ -24,8 +24,7 @@
 #       Change the container image used for processing Jinja templates, such as to one built locally
 #
 #    J2CLI_DOCKER_LABEL?=latest
-#       Change the label used for the Jinja template container. Note that the default is `latest` unless PYTHON_VERSION
-#       is set, in which case it defaults to the one corresponding to that Python version.
+#       Change the label used for the Jinja template container
 #
 #    PBRVERSION_CONTAINER?=public.ecr.aws/o4o2s1w1/cloudfit/pbrversion
 #       Change the container image used for calculating version numbers, such as to one built locally
@@ -48,7 +47,7 @@ commontooling_dir?=$(project_root_dir)/commontooling
 endif
 
 include $(commontooling_dir)/make/include/core.mk
--include $(project_root_dir)/commontooling/make/include/pull_request_template.mk
+-include $(project_root_dir)/commontooling/make/include/github.mk
 include $(commontooling_dir)/make/include/gitignore.mk
 
 .PHONY: prepcode