diff --git a/src/docker.rs b/src/docker.rs index c4b510b..36d26b2 100644 --- a/src/docker.rs +++ b/src/docker.rs @@ -141,11 +141,11 @@ mod tests { env.insert("BAZ".to_string(), "BOO".to_string()); d.run_container( &name, - "forgeflux/ftest-dev-docker-cmd", + "forgeflux/ftest-docker-cmd-tester", true, &env, None, - false, + true, ); let out = Command::new("docker") .args(["container", "inspect", "-f", "'{{.State.Running}}'", &name]) diff --git a/tests/docker-cmd/Dockerfile b/tests/docker-cmd/Dockerfile deleted file mode 100644 index 772bac3..0000000 --- a/tests/docker-cmd/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM debian:latest - -LABEL org.opencontainers.image.source https://git.batsense.net/ForgeFlux/ftest - -RUN mkdir /sr/ -WORKDIR /src/ -COPY . . -RUN find . -RUN ls . -CMD ["/src/scripts/run.sh"] diff --git a/tests/docker-cmd/Makefile b/tests/docker-cmd/Makefile deleted file mode 100644 index 7b560c0..0000000 --- a/tests/docker-cmd/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -default: - docker buildx build -t forgeflux/ftest-dev-docker-cmd --load . -run: - docker run forgeflux/ftest-dev-test-docker-cmd diff --git a/tests/docker-cmd/scripts/run.sh b/tests/docker-cmd/scripts/run.sh deleted file mode 100755 index 710ea1c..0000000 --- a/tests/docker-cmd/scripts/run.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -echo "running" -echo "env:" -printenv $@ -sleep 10 -echo "exiting" -exit 0 diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml index b35c8cd..0baf16c 100644 --- a/tests/docker-compose.yml +++ b/tests/docker-compose.yml @@ -1,6 +1,6 @@ services: foo: - image: "forgeflux/ftest-dev-docker-cmd" + image: "forgeflux/ftest-docker-cmd-tester" container_name: foo environment: NAME: foo @@ -8,7 +8,7 @@ services: bar: - image: "forgeflux/ftest-dev-docker-cmd" + image: "forgeflux/ftest-docker-cmd-tester" container_name: bar environment: NAME: bar