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.

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

[Docker] Fix bug when a putative target address did not exist. #14125

Merged
merged 1 commit into from Jan 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 14 additions & 3 deletions src/python/pants/backend/docker/util_rules/dependencies.py
Expand Up @@ -3,6 +3,7 @@

from pants.backend.docker.subsystems.dockerfile_parser import DockerfileInfo, DockerfileInfoRequest
from pants.backend.docker.target_types import DockerDependenciesField
from pants.base.specs import AddressSpecs, MaybeEmptySiblingAddresses
from pants.core.goals.package import PackageFieldSet
from pants.engine.addresses import Addresses, UnparsedAddressInputs
from pants.engine.rules import Get, collect_rules, rule
Expand All @@ -22,18 +23,28 @@ class InjectDockerDependencies(InjectDependenciesRequest):

@rule
async def inject_docker_dependencies(request: InjectDockerDependencies) -> InjectedDependencies:
"""Inspects COPY instructions in the Dockerfile for references to known targets."""
"""Inspects COPY instructions in the Dockerfile for references to known packagable targets."""
dockerfile_info = await Get(
DockerfileInfo, DockerfileInfoRequest(request.dependencies_field.address)
)

targets = await Get(
Targets,
# Parse all putative target addresses.
putative_addresses = await Get(
Addresses,
UnparsedAddressInputs(
dockerfile_info.putative_target_addresses,
owning_address=dockerfile_info.address,
),
)

# Get the target for those addresses that are known.
directories = {address.spec_path for address in putative_addresses}
all_addresses = await Get(Addresses, AddressSpecs(map(MaybeEmptySiblingAddresses, directories)))
targets = await Get(
Targets, Addresses((address for address in putative_addresses if address in all_addresses))
)

# Only keep those targets that we can "package".
package = await Get(FieldSetsPerTarget, FieldSetsPerTargetRequest(PackageFieldSet, targets))
referenced_targets = (
field_sets[0].address for field_sets in package.collection if len(field_sets) > 0
Expand Down
Expand Up @@ -286,7 +286,7 @@ def test_packaged_pex_path(rule_runner: RuleRunner) -> None:
rule_runner.write_files(
{
"src/docker/BUILD": """docker_image(dependencies=["src/python/proj/cli:bin"])""",
"src/docker/Dockerfile": """FROM python""",
"src/docker/Dockerfile": """FROM python:3.8""",
"src/python/proj/cli/BUILD": """pex_binary(name="bin", entry_point="main.py")""",
"src/python/proj/cli/main.py": """print("cli main")""",
}
Expand Down Expand Up @@ -593,3 +593,38 @@ def test_create_docker_build_context() -> None:
assert dict(context.build_env.environment) == {"ENVNAME": "value2"}
assert context.dockerfile == "test/Dockerfile"
assert context.stages == ("base", "dev", "prod")


def test_pex_custom_output_path_issue14031(rule_runner: RuleRunner) -> None:
rule_runner.write_files(
{
"project/test/BUILD": dedent(
"""\
pex_binary(
name="test",
entry_point="main.py",
output_path="project/test.pex",
)

docker_image(
name="test-image",
dependencies=[":test"],
)
"""
),
"project/test/main.py": "print('Hello')",
"project/test/Dockerfile": dedent(
"""\
FROM python:3.8
COPY project/test.pex .
CMD ["./test.pex"]
"""
),
}
)

assert_build_context(
rule_runner,
Address("project/test", target_name="test-image"),
expected_files=["project/test/Dockerfile", "project/test.pex"],
)