Fix molecule broken envvar refs

nephelaiio · Jan 9, 2024 · e65d7ef · e65d7ef
1 parent c1400a3
commit e65d7ef
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -32,7 +32,9 @@ collections:
 requirements: roles collections
 
 dependency create prepare converge idempotence side-effect verify destroy login reset:
-	MOLECULE_DOCKER_IMAGE=${MOLECULE_DOCKER_IMAGE} poetry run molecule $@ -s ${MOLECULE_SCENARIO}
+	MOLECULE_DOCKER_IMAGE=${MOLECULE_DOCKER_IMAGE} \
+	MOLECULE_DOCKER_COMMAND=${MOLECULE_DOCKER_COMMAND} \
+		poetry run molecule $@ -s ${MOLECULE_SCENARIO}
 
 ignore:
 	poetry run ansible-lint --generate-ignore

diff --git a/molecule/hold/molecule.yml b/molecule/hold/molecule.yml
@@ -5,9 +5,9 @@ driver:
   name: docker
 platforms:
   - name: docker-hold
-    image: geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2204}-ansible
+    image: geerlingguy/docker-${MOLECULE_DOCKER_IMAGE:-ubuntu2204}-ansible
     pre_build_image: true
-    command: ${MOLECULE_COMMAND:-"/lib/systemd/systemd"}
+    command: ${MOLECULE_DOCKER_COMMAND:-"/lib/systemd/systemd"}
     cgroupns_mode: host
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw

diff --git a/molecule/install/molecule.yml b/molecule/install/molecule.yml
@@ -5,9 +5,9 @@ driver:
   name: docker
 platforms:
   - name: docker-install
-    image: geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2204}-ansible
+    image: geerlingguy/docker-${MOLECULE_DOCKER_IMAGE:-ubuntu2204}-ansible
     pre_build_image: true
-    command: ${MOLECULE_COMMAND:-"/lib/systemd/systemd"}
+    command: ${MOLECULE_DOCKER_COMMAND:-"/lib/systemd/systemd"}
     cgroupns_mode: host
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw