Skip to content

Commit 5cde386

Browse files
authored
Allow variable configuration for metalctl docker compose container. (#213)
1 parent 2b929f6 commit 5cde386

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

.github/workflows/integration.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ jobs:
7676
- name: Run integration tests
7777
shell: bash
7878
run: |
79+
eval $(make dev-env)
7980
./test/ci-cleanup.sh
8081
./test/integration.sh
8182
env:

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ YQ=docker run --rm -i -v $(shell pwd):/workdir mikefarah/yq:4
77
KINDCONFIG := $(or $(KINDCONFIG),control-plane/kind.yaml)
88
KUBECONFIG := $(shell pwd)/.kubeconfig
99

10+
METALCTL_HMAC := $(or $(METALCTL_HMAC),metal-admin)
11+
METALCTL_API_URL := $(or $(METALCTL_API_URL),http://api.172.17.0.1.nip.io:8080/metal)
12+
1013
MKE2FS_CONFIG := $(shell pwd)/mke2fs.conf
1114
# Default values
1215
CONTAINERLAB=$(shell which containerlab)

compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ services:
6868
metalctl:
6969
image: ghcr.io/metal-stack/metalctl:${METALCTL_IMAGE_TAG}
7070
environment:
71-
- METALCTL_HMAC=metal-admin
72-
- METALCTL_API_URL=http://api.172.17.0.1.nip.io:8080/metal
71+
- METALCTL_HMAC=${METALCTL_HMAC}
72+
- METALCTL_API_URL=${METALCTL_API_URL}
7373
volumes:
7474
- ./files/ssh:/root/.ssh:ro
7575
- ./files/ignition.json:/tmp/ignition.json

0 commit comments

Comments
 (0)