Allow variable configuration for metalctl docker compose container. (#…

…213)
metal-stack · Jan 17, 2025 · 5cde386 · 5cde386
1 parent 2b929f6
commit 5cde386
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
@@ -76,6 +76,7 @@ jobs:
     - name: Run integration tests
       shell: bash
       run: |
+        eval $(make dev-env)
         ./test/ci-cleanup.sh
         ./test/integration.sh
       env:

diff --git a/Makefile b/Makefile
@@ -7,6 +7,9 @@ YQ=docker run --rm -i -v $(shell pwd):/workdir mikefarah/yq:4
 KINDCONFIG := $(or $(KINDCONFIG),control-plane/kind.yaml)
 KUBECONFIG := $(shell pwd)/.kubeconfig
 
+METALCTL_HMAC := $(or $(METALCTL_HMAC),metal-admin)
+METALCTL_API_URL := $(or $(METALCTL_API_URL),http://api.172.17.0.1.nip.io:8080/metal)
+
 MKE2FS_CONFIG := $(shell pwd)/mke2fs.conf
 # Default values
 CONTAINERLAB=$(shell which containerlab)

diff --git a/compose.yaml b/compose.yaml
@@ -68,8 +68,8 @@ services:
   metalctl:
     image: ghcr.io/metal-stack/metalctl:${METALCTL_IMAGE_TAG}
     environment:
-      - METALCTL_HMAC=metal-admin
-      - METALCTL_API_URL=http://api.172.17.0.1.nip.io:8080/metal
+      - METALCTL_HMAC=${METALCTL_HMAC}
+      - METALCTL_API_URL=${METALCTL_API_URL}
     volumes:
       - ./files/ssh:/root/.ssh:ro
       - ./files/ignition.json:/tmp/ignition.json