From a78b84429d3300ee5f37f3dfe38e3ad91fbff4e9 Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Mon, 13 Dec 2021 11:15:57 -0700 Subject: [PATCH] refactored to follow the original stream test Signed-off-by: Richard Jones --- tests/plan.bats | 5 +---- tests/plan/context/services/unix/main.cue | 21 +++++++++++++++------ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/tests/plan.bats b/tests/plan.bats index cdb8ea53..87fd15a0 100644 --- a/tests/plan.bats +++ b/tests/plan.bats @@ -12,8 +12,5 @@ setup() { @test "plan: unix socket" { cd "$TESTDIR" - "$DAGGER" --europa up ./plan/hello-europa - run curl http://localhost:8080 - assert_output --partial "Hello World" - docker rm -f nginx-hello + "$DAGGER" --europa up ./plan/context/services/unix } \ No newline at end of file diff --git a/tests/plan/context/services/unix/main.cue b/tests/plan/context/services/unix/main.cue index 7c33e0a0..5c521f8e 100644 --- a/tests/plan/context/services/unix/main.cue +++ b/tests/plan/context/services/unix/main.cue @@ -2,15 +2,24 @@ package main import ( "alpha.dagger.io/dagger/engine" - "alpha.dagger.io/docker" + "alpha.dagger.io/dagger/op" + "alpha.dagger.io/alpine" ) engine.#Plan & { context: services: dockerSocket: unix: "/var/run/docker.sock" - actions: nginx: docker.#Run & { - ref: "nginxdemos/nginx-hello" - name: "nginx-hello" - ports: ["8080:8080"] - socket: context.services.dockerSocket.service + + actions: { + load: op.#Load & { + from: alpine.#Image & { + package: "docker-cli": true + } + } + + exec: op.#Exec & { + always: true + mount: "/var/run/docker.sock": stream: context.services.dockerSocket.service + args: ["docker", "info"] + } } }