From 158151230c105649be3ceb0c0a06b15579311d23 Mon Sep 17 00:00:00 2001 From: Serhii Chvaliuk Date: Wed, 12 Jan 2022 16:28:04 +0200 Subject: [PATCH] Remove intermediate docker images with DOCKER_BUILDKIT=1 (#9408) * DOCKER_BUILDKIT=1 added Signed-off-by: Sergey Chvalyuk --- airbyte-integrations/bases/source-acceptance-test/Dockerfile | 2 +- .../bases/source-acceptance-test/unit_tests/test_utils.py | 2 +- tools/bin/build_image.sh | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/airbyte-integrations/bases/source-acceptance-test/Dockerfile b/airbyte-integrations/bases/source-acceptance-test/Dockerfile index 7f9633a02b62..ad60ff025240 100644 --- a/airbyte-integrations/bases/source-acceptance-test/Dockerfile +++ b/airbyte-integrations/bases/source-acceptance-test/Dockerfile @@ -33,7 +33,7 @@ COPY pytest.ini setup.py ./ COPY source_acceptance_test ./source_acceptance_test RUN pip install . -LABEL io.airbyte.version=0.1.41 +LABEL io.airbyte.version=0.1.42 LABEL io.airbyte.name=airbyte/source-acceptance-test ENTRYPOINT ["python", "-m", "pytest", "-p", "source_acceptance_test.plugin", "-r", "fEsx"] diff --git a/airbyte-integrations/bases/source-acceptance-test/unit_tests/test_utils.py b/airbyte-integrations/bases/source-acceptance-test/unit_tests/test_utils.py index 2d8840e50c5c..e8042c0ad961 100644 --- a/airbyte-integrations/bases/source-acceptance-test/unit_tests/test_utils.py +++ b/airbyte-integrations/bases/source-acceptance-test/unit_tests/test_utils.py @@ -281,7 +281,7 @@ def test_docker_runner(command, wait_timeout, expected_count): assert set(lines) == set(["something\n"]) assert len(lines) == expected_count - for container in client.containers.list(all=True): + for container in client.containers.list(all=True, ignore_removed=True): assert container.id != new_container.id, "Container should be removed after reading" diff --git a/tools/bin/build_image.sh b/tools/bin/build_image.sh index 6bf078efa942..3c41ced70fdc 100755 --- a/tools/bin/build_image.sh +++ b/tools/bin/build_image.sh @@ -8,6 +8,8 @@ DOCKERFILE="$3" TAGGED_IMAGE="$4" ID_FILE="$5" FOLLOW_SYMLINKS="$6" +# https://docs.docker.com/develop/develop-images/build_enhancements/ +export DOCKER_BUILDKIT=1 cd "$ROOT_DIR" . tools/lib/lib.sh