From 34e8655a084d4f919b83ad459a1c1313674c72d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Tue, 27 Sep 2022 00:35:30 +0200
Subject: [PATCH] ci: Use versioned image tags

---
 .gitlab-ci.yml                            | 5 +++--
 .gitlab-ci/libfprint-image-variables.yaml | 2 ++
 .gitlab-ci/libfprint-templates.yaml       | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 .gitlab-ci/libfprint-image-variables.yaml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb2e559b..5a76327d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,5 @@
 include:
+  - local: '.gitlab-ci/libfprint-image-variables.yaml'
   - local: '.gitlab-ci/libfprint-templates.yaml'
   - project: 'freedesktop/ci-templates'
     ref: master
@@ -7,7 +8,7 @@ include:
 
 variables:
   extends: .libfprint_common_variables
-  FDO_DISTRIBUTION_TAG: latest
+  FDO_DISTRIBUTION_TAG: $LIBFPRINT_IMAGE_TAG
   FDO_DISTRIBUTION_VERSION: rawhide
   FDO_UPSTREAM_REPO: "libfprint/$CI_PROJECT_NAME"
   FEDORA_IMAGE: "$CI_REGISTRY/libfprint/$CI_PROJECT_NAME/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG"
@@ -198,4 +199,4 @@ container_fedora_build_on_deps_changed:
       - branches
       - merge_requests
     changes:
-      - .gitlab-ci/libfprint-templates.yaml
+      - .gitlab-ci/libfprint-image-variables.yaml
diff --git a/.gitlab-ci/libfprint-image-variables.yaml b/.gitlab-ci/libfprint-image-variables.yaml
new file mode 100644
index 00000000..2090e6fa
--- /dev/null
+++ b/.gitlab-ci/libfprint-image-variables.yaml
@@ -0,0 +1,2 @@
+variables:
+  LIBFPRINT_IMAGE_TAG: v1
diff --git a/.gitlab-ci/libfprint-templates.yaml b/.gitlab-ci/libfprint-templates.yaml
index 43edc245..a4ef62ac 100644
--- a/.gitlab-ci/libfprint-templates.yaml
+++ b/.gitlab-ci/libfprint-templates.yaml
@@ -1,3 +1,6 @@
+# Bump image version on .gitlab-ci/libfprint-image-variables.yaml to trigger
+# a rebuild on changes to this file
+
 .libfprint_common_variables:
   LIBFPRINT_DEPENDENCIES:
     doxygen