From 3462b7585b2c2854c03447e1272bb9b673297271 Mon Sep 17 00:00:00 2001 From: Ben Einaudi Date: Sun, 24 May 2020 13:04:27 +0200 Subject: [PATCH] Added integration test for multi level argument Added integration test to check that following pattern is supported ARG TAG=1.2 ARG IMAGE=my-image:${TAG} FROM ${IMAGE} ... --- integration/dockerfiles/Dockerfile_test_arg_two_level | 3 +++ integration/integration_test.go | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 integration/dockerfiles/Dockerfile_test_arg_two_level diff --git a/integration/dockerfiles/Dockerfile_test_arg_two_level b/integration/dockerfiles/Dockerfile_test_arg_two_level new file mode 100644 index 0000000000..8dc9d6ad68 --- /dev/null +++ b/integration/dockerfiles/Dockerfile_test_arg_two_level @@ -0,0 +1,3 @@ +ARG A=3.9 +ARG B=alpine:${A} +FROM ${B} diff --git a/integration/integration_test.go b/integration/integration_test.go index 7156591d1d..3d60caa06c 100644 --- a/integration/integration_test.go +++ b/integration/integration_test.go @@ -306,7 +306,7 @@ func TestGitBuildcontextSubPath(t *testing.T) { func TestBuildViaRegistryMirror(t *testing.T) { repo := getGitRepo() - dockerfile := "integration/dockerfiles/Dockerfile_registry_mirror" + dockerfile := fmt.Sprintf("%s/%s/Dockerfile_registry_mirror", integrationPath, dockerfilesPath) // Build with docker dockerImage := GetDockerImage(config.imageRepo, "Dockerfile_registry_mirror") @@ -345,7 +345,7 @@ func TestBuildViaRegistryMirror(t *testing.T) { func TestBuildWithLabels(t *testing.T) { repo := getGitRepo() - dockerfile := "integration/dockerfiles/Dockerfile_test_label" + dockerfile := fmt.Sprintf("%s/%s/Dockerfile_test_label", integrationPath, dockerfilesPath) testLabel := "mylabel=myvalue"