From c6da3eeb9e8f99cf9aa51bf7dc99fd19aba2471f Mon Sep 17 00:00:00 2001 From: Tom Chauveau Date: Fri, 18 Mar 2022 12:38:50 +0100 Subject: [PATCH] Update dockerfile test to use client API Signed-off-by: Vasek - Tom C --- pkg/universe.dagger.io/docker/test/dockerfile.cue | 6 +++--- pkg/universe.dagger.io/docker/test/test.bats | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkg/universe.dagger.io/docker/test/dockerfile.cue b/pkg/universe.dagger.io/docker/test/dockerfile.cue index 73982fb3..259a86b2 100644 --- a/pkg/universe.dagger.io/docker/test/dockerfile.cue +++ b/pkg/universe.dagger.io/docker/test/dockerfile.cue @@ -6,9 +6,9 @@ import ( ) dagger.#Plan & { - inputs: directories: testdata: path: "./testdata" + client: filesystem: "./testdata": read: contents: dagger.#FS - actions: tests: dockerfile: { + actions: test: dockerfile: { simple: { build: docker.#Build & { steps: [ @@ -45,7 +45,7 @@ dagger.#Plan & { build: docker.#Build & { steps: [ docker.#Dockerfile & { - source: inputs.directories.testdata.contents + source: client.filesystem."./testdata".read.contents }, docker.#Run & { command: { diff --git a/pkg/universe.dagger.io/docker/test/test.bats b/pkg/universe.dagger.io/docker/test/test.bats index f95740d7..bebf70cb 100644 --- a/pkg/universe.dagger.io/docker/test/test.bats +++ b/pkg/universe.dagger.io/docker/test/test.bats @@ -5,5 +5,8 @@ setup() { } @test "docker" { - dagger "do" -p ./ test + dagger "do" -p ./build.cue test + dagger "do" -p ./dockerfile.cue test + dagger "do" -p ./run.cue test + dagger "do" -p ./image.cue test }