ci(compose): Expand .env with image references for mender-gateway

Ticket: QA-804 Signed-off-by: Alf-Rune Siqveland <[email protected]>
jamtools · Nov 12, 2024 · ad292aa · ad292aa
1 parent 33e8976
commit ad292aa
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/.env b/.env
@@ -4,6 +4,17 @@ MENDER_SERVER_REPOSITORY=mendersoftware
 MENDER_SERVER_ENTERPRISE_REPOSITORY=mender-server-enterprise
 MENDER_SERVER_TAG=main
 MENDER_CLIENT_TAG=mender-master
+
+# Artifacts from mender-gateway
+MENDER_GATEWAY_REGISTRY=registry.mender.io
+MENDER_GATEWAY_REPOSITORY=mendersoftware
+MENDER_GATEWAY_TAG=master
+
+# Artifacts from meta-mender
+MENDER_GATEWAY_QEMU_REGISTRY=registry.mender.io
+MENDER_GATEWAY_QEMU_REPOSITORY=mendersoftware
+MENDER_GATEWAY_QEMU_TAG=mender-master
+
 MENDER_ARTIFACT_VERSION=3.11.2
 
 # If MENDER_LEGACY_IMAGE is defined, the image reference uses

diff --git a/docker-compose.mender-gateway.commercial.yml b/docker-compose.mender-gateway.commercial.yml
@@ -3,7 +3,7 @@ services:
   # mender-gateway
   #
   mender-gateway:
-    image: registry.mender.io/mendersoftware/mender-gateway-qemu-commercial:${MENDER_CLIENT_TAG}
+    image: ${MENDER_GATEWAY_QEMU_REGISTRY}/${MENDER_GATEWAY_QEMU_REPOSITORY}/mender-gateway-qemu-commercial:${MENDER_GATEWAY_QEMU_TAG}
     networks:
       - mender
     stdin_open: true

diff --git a/extra/mtls/docker-compose.mtls-test.yml b/extra/mtls/docker-compose.mtls-test.yml
@@ -1,6 +1,6 @@
 services:
   mtls-gateway:
-    image: registry.mender.io/mendersoftware/mender-gateway:master
+    image: ${MENDER_GATEWAY_REGISTRY}/${MENDER_GATEWAY_REPOSITORY}/mender-gateway:${MENDER_GATEWAY_TAG}
     networks:
       - mender
     volumes: