From d6919c1cdbc0e3611c4f0873695a200212951cda Mon Sep 17 00:00:00 2001
From: pegtrifork <peg@trifork.com>
Date: Thu, 4 Jan 2024 14:46:48 +0100
Subject: [PATCH 1/2] change DOCKER_REGISTRY to  CHEETAH_DOCKER_REGISTRY

---
 .env                       | 2 +-
 .github/workflows/e2e.yaml | 2 +-
 docker-compose/kafka.yaml  | 2 +-
 docker-compose/os.yaml     | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.env b/.env
index 71b595c..d84c612 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
-DOCKER_REGISTRY=ghcr.io/trifork/
+CHEETAH_DOCKER_REGISTRY=ghcr.io/trifork/
 COMPOSE_PROJECT_NAME=cheetah-infrastructure
 COMPOSE_PATH_SEPARATOR=:
 COMPOSE_FILE=docker-compose.yaml:docker-compose/kafka.yaml:docker-compose/os.yaml:docker-compose/oauth.yaml:docker-compose/observability.yaml
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 40f624f..6ef4c66 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -17,7 +17,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  DOCKER_REGISTRY: ghcr.io/trifork/
+  CHEETAH_DOCKER_REGISTRY: ghcr.io/trifork/
 
 jobs:
   should-run:
diff --git a/docker-compose/kafka.yaml b/docker-compose/kafka.yaml
index d0e9e85..5c81ea9 100644
--- a/docker-compose/kafka.yaml
+++ b/docker-compose/kafka.yaml
@@ -20,7 +20,7 @@ services:
       - full
 
   kafka:
-    image: ${DOCKER_REGISTRY-}cheetah-infrastructure-utils-kafka:strimzi-0.38.0-kafka-3.6.0-trifork-1.5.0
+    image: ${CHEETAH_DOCKER_REGISTRY-}cheetah-infrastructure-utils-kafka:strimzi-0.38.0-kafka-3.6.0-trifork-1.5.0
     platform: linux/amd64
     hostname: kafka
     mem_limit: 1024m
diff --git a/docker-compose/os.yaml b/docker-compose/os.yaml
index 1476353..0fb81e9 100644
--- a/docker-compose/os.yaml
+++ b/docker-compose/os.yaml
@@ -5,7 +5,7 @@ services:
   # login fallback: admin:admin
   # services should use oauth
   opensearch:
-    image: ${DOCKER_REGISTRY-}cheetah-infrastructure-opensearch:0.5.0
+    image: ${CHEETAH_DOCKER_REGISTRY-}cheetah-infrastructure-opensearch:0.5.0
     hostname: opensearch
     environment:
       - cluster.name=opensearch-cluster
@@ -53,7 +53,7 @@ services:
       retries: 5
 
   opensearch-configurer:
-    image: ${DOCKER_REGISTRY-}cheetah-infrastructure-utils-os:0.5.0
+    image: ${CHEETAH_DOCKER_REGISTRY-}cheetah-infrastructure-utils-os:0.5.0
     command: "opensearch:9200 --service"
     environment:
       - OS_USER=admin

From 8047e47c9cc9ecc04e80fe2cf6855def5e5cd058 Mon Sep 17 00:00:00 2001
From: pegtrifork <peg@trifork.com>
Date: Thu, 4 Jan 2024 14:52:20 +0100
Subject: [PATCH 2/2] change DOCKER_REGISTRY to  CHEETAH_DOCKER_REGISTRY

---
 docker-compose/oauth.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose/oauth.yaml b/docker-compose/oauth.yaml
index 5c73f90..84dff33 100644
--- a/docker-compose/oauth.yaml
+++ b/docker-compose/oauth.yaml
@@ -6,7 +6,7 @@ services:
     hostname: cheetahoauthsimulator
     ports:
       - "1752:80"
-    image: ${DOCKER_REGISTRY-}cheetah-oauth-simulator:1.7.2
+    image: ${CHEETAH_DOCKER_REGISTRY-}cheetah-oauth-simulator:1.7.2
     platform: linux/amd64
     restart: unless-stopped
     environment:
@@ -24,7 +24,7 @@ services:
     hostname: cheetahoauthsimulator
     ports:
       - "1852:1852"
-    image: ${DOCKER_REGISTRY-}cheetah-oauth-simulator:1.7.2
+    image: ${CHEETAH_DOCKER_REGISTRY-}cheetah-oauth-simulator:1.7.2
     platform: linux/amd64
     environment:
       - ASPNETCORE_ENVIRONMENT=Development