diff --git a/tests/docker_cases/Dockerfile.case2 b/tests/docker_cases/Dockerfile.case2 index fbab9f2..11b4d57 100644 --- a/tests/docker_cases/Dockerfile.case2 +++ b/tests/docker_cases/Dockerfile.case2 @@ -1,3 +1,4 @@ +# syntax=jinahub/dockerfile:1.4.3-magic-shell FROM jinaai/jina:2.0-perf COPY . /workspace diff --git a/tests/docker_cases/Dockerfile.case2.expect b/tests/docker_cases/Dockerfile.case2.expect index fbab9f2..11b4d57 100644 --- a/tests/docker_cases/Dockerfile.case2.expect +++ b/tests/docker_cases/Dockerfile.case2.expect @@ -1,3 +1,4 @@ +# syntax=jinahub/dockerfile:1.4.3-magic-shell FROM jinaai/jina:2.0-perf COPY . /workspace diff --git a/tests/test_docker.py b/tests/test_docker.py index eed130d..10aa264 100644 --- a/tests/test_docker.py +++ b/tests/test_docker.py @@ -36,20 +36,22 @@ def test_baseimage(exe_dockerfile): @pytest.mark.parametrize( - 'docker_file, docker_expect_file', + 'docker_file, docker_expect_file, dockerfile_syntax', [ ( Path(__file__).parent / 'docker_cases' / 'Dockerfile.case1', - Path(__file__).parent / 'docker_cases' / 'Dockerfile.case1.expect' + Path(__file__).parent / 'docker_cases' / 'Dockerfile.case1.expect', + None ), ( Path(__file__).parent / 'docker_cases' / 'Dockerfile.case2', - Path(__file__).parent / 'docker_cases' / 'Dockerfile.case2.expect' + Path(__file__).parent / 'docker_cases' / 'Dockerfile.case2.expect', + 'jinahub/dockerfile:1.4.3-magic-shell' ) ], ) -def test_load_dockerfile(docker_file, docker_expect_file): +def test_load_dockerfile(docker_file, docker_expect_file, dockerfile_syntax): parser = ExecutorDockerfile(docker_file=docker_file) @@ -57,6 +59,9 @@ def test_load_dockerfile(docker_file, docker_expect_file): assert str(parser) == str(expect_parser) + assert parser.syntax == expect_parser.syntax + assert expect_parser.syntax == expect_parser.syntax + assert len(parser.parent_images) == 1 assert parser.baseimage == 'jinaai/jina:2.0-perf' assert parser.entrypoint == '["jina", "executor", "--uses", "config.yml"]'