Skip to content

Commit 2f1c666

Browse files
committed
clarify var names, ensure dir exists
1 parent 90d4f1b commit 2f1c666

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

airbyte_cdk/utils/docker.py

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,9 @@ def build_connector_image(
167167
if dockerfile_override:
168168
dockerfile_path = dockerfile_override
169169
else:
170-
dockerfile_path = connector_directory / "build" / "docker" / "Dockerfile"
171-
dockerignore_path = connector_directory / "build" / "docker" / "Dockerfile.dockerignore"
170+
dockerfile_dir = connector_directory / "build" / "docker"
171+
dockerfile_path = dockerfile_dir / "Dockerfile"
172+
dockerignore_path = dockerfile_dir / "Dockerfile.dockerignore"
172173
try:
173174
dockerfile_text, dockerignore_text = get_dockerfile_templates(
174175
metadata=metadata,
@@ -191,6 +192,7 @@ def build_connector_image(
191192
),
192193
) from e
193194

195+
dockerfile_dir.mkdir(parents=True, exist_ok=True)
194196
dockerfile_path.write_text(dockerfile_text)
195197
dockerignore_path.write_text(dockerignore_text)
196198

@@ -339,24 +341,24 @@ def get_dockerfile_templates(
339341
from_dir=connector_directory,
340342
)
341343
# airbyte_repo_root successfully resolved
342-
dockerfile_path = (
344+
source_dockerfile_path = (
343345
airbyte_repo_root / "docker-images" / f"Dockerfile.{metadata.data.language.value}-connector"
344346
)
345-
dockerignore_path = (
347+
source_dockerignore_path = (
346348
airbyte_repo_root
347349
/ "docker-images"
348350
/ f"Dockerfile.{metadata.data.language.value}-connector.dockerignore"
349351
)
350-
if not dockerfile_path.exists():
352+
if not source_dockerfile_path.exists():
351353
raise FileNotFoundError(
352-
f"Dockerfile for {metadata.data.language.value} connector not found at {dockerfile_path}"
354+
f"Dockerfile for {metadata.data.language.value} connector not found at {source_dockerfile_path}"
353355
)
354-
if not dockerignore_path.exists():
356+
if not source_dockerignore_path.exists():
355357
raise FileNotFoundError(
356-
f".dockerignore for {metadata.data.language.value} connector not found at {dockerignore_path}"
358+
f".dockerignore for {metadata.data.language.value} connector not found at {source_dockerignore_path}"
357359
)
358360

359-
return dockerfile_path.read_text(), dockerignore_path.read_text()
361+
return source_dockerfile_path.read_text(), source_dockerignore_path.read_text()
360362

361363

362364
def run_docker_command(

0 commit comments

Comments
 (0)