Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove intermediate docker images with DOCKER_BUILDKIT=1 #9408

Merged
merged 5 commits into from
Jan 12, 2022
Merged

Remove intermediate docker images with DOCKER_BUILDKIT=1 #9408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
695e324
DOCKER_BUILDKIT=1 added
grubberr Jan 11, 2022
64a87e1
Merge branch 'master' into grubberr/9308-docker-buildkit
grubberr Jan 11, 2022
615efa0
move DOCKER_BUILDKIT to top script, add docs
grubberr Jan 11, 2022
a4466a0
Merge branch 'master' into grubberr/9308-docker-buildkit
grubberr Jan 12, 2022
1f933f5
source_acceptance_test 0.1.41 -> 0.1.42
grubberr Jan 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion airbyte-integrations/bases/source-acceptance-test/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion airbyte-integrations/bases/source-acceptance-test/unit_tests/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"


Expand Down
2 changes: 2 additions & 0 deletions tools/bin/build_image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down