From 3292ec797c1c4a0abceffa459c024271b2103b38 Mon Sep 17 00:00:00 2001
From: Timo Furrer <tfurrer@gitlab.com>
Date: Thu, 18 Jan 2024 16:59:01 +0100
Subject: [PATCH] Fix double $$ from Makefile

---
 backports/.Base.gitlab-ci.yml         | 4 ++--
 backports/OpenTofu/Base.gitlab-ci.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backports/.Base.gitlab-ci.yml b/backports/.Base.gitlab-ci.yml
index 0fd8aa7..9f3c6ec 100644
--- a/backports/.Base.gitlab-ci.yml
+++ b/backports/.Base.gitlab-ci.yml
@@ -18,8 +18,8 @@ variables:
   # Compatible OpenTofu version, see https://gitlab.com/components/opentofu/-/releases
   OPENTOFU_VERSION: "1.6.0"
   # Job Image with `gitlab-tofu`
-  GITLAB_OPENTOFU_IMAGE: registry.gitlab.com/components/opentofu/gitlab-opentofu:$$VERSION-opentofu$$OPENTOFU_VERSION
+  GITLAB_OPENTOFU_IMAGE: registry.gitlab.com/components/opentofu/gitlab-opentofu:$VERSION-opentofu$OPENTOFU_VERSION
   # The relative path to the root directory of the OpenTofu project
-  TF_ROOT: $${CI_PROJECT_DIR}
+  TF_ROOT: ${CI_PROJECT_DIR}
   # The name of the state file used by the GitLab Managed Terraform state backend
   TF_STATE_NAME: default
diff --git a/backports/OpenTofu/Base.gitlab-ci.yml b/backports/OpenTofu/Base.gitlab-ci.yml
index b03554c..d13cec1 100644
--- a/backports/OpenTofu/Base.gitlab-ci.yml
+++ b/backports/OpenTofu/Base.gitlab-ci.yml
@@ -18,9 +18,9 @@ variables:
   # Compatible OpenTofu version, see https://gitlab.com/components/opentofu/-/releases
   OPENTOFU_VERSION: "1.6.0"
   # Job Image with `gitlab-tofu`
-  GITLAB_OPENTOFU_IMAGE: registry.gitlab.com/components/opentofu/gitlab-opentofu:$$VERSION-opentofu$$OPENTOFU_VERSION
+  GITLAB_OPENTOFU_IMAGE: registry.gitlab.com/components/opentofu/gitlab-opentofu:$VERSION-opentofu$OPENTOFU_VERSION
   # The relative path to the root directory of the OpenTofu project
-  TF_ROOT: $${CI_PROJECT_DIR}
+  TF_ROOT: ${CI_PROJECT_DIR}
   # The name of the state file used by the GitLab Managed Terraform state backend
   TF_STATE_NAME: default
 
-- 
GitLab