From 8cde4966a79b62be5e390a73299e37ee2cd7e8fc Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 9 Sep 2024 08:32:41 -0700
Subject: [PATCH] Tag etherpad images with version

We'll continue to deploy 'latest' but we tag the etherpad version
explicitly in order to make rollbacks simpler if necessary. Etherpad has
seen a resurgence in development which has led to some potentially
painful upgrade paths that we need to accomodate. Having rollbacks be
possible is a nice safety net.

Change-Id: I3ea59c1e4b33d777fae356d377773a4a60e9313e
---
 docker/etherpad/Dockerfile         | 2 +-
 zuul.d/docker-images/etherpad.yaml | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docker/etherpad/Dockerfile b/docker/etherpad/Dockerfile
index b6b1bb061f..f0f246e8ff 100644
--- a/docker/etherpad/Dockerfile
+++ b/docker/etherpad/Dockerfile
@@ -16,7 +16,7 @@
 # Adapted from the upstream Dockerfile because they haven't kept up with
 # recent releases.
 
-# Force a new build: Thu, 02 May 2024 20:51:03 +0000
+# Force a new build: Mon Sep  9 03:32:20 PM UTC 2024
 
 # Etherpad Lite Dockerfile
 #
diff --git a/zuul.d/docker-images/etherpad.yaml b/zuul.d/docker-images/etherpad.yaml
index f74d18f5fa..53f90bc2e2 100644
--- a/zuul.d/docker-images/etherpad.yaml
+++ b/zuul.d/docker-images/etherpad.yaml
@@ -9,6 +9,9 @@
         - context: docker/etherpad
           target: production
           repository: opendevorg/etherpad
+          tags:
+            - latest
+            - v2.1.1
           build_args:
             - EP_GID=5001
     files: &etherpad_files