Skip to content

Add option to keep build contexts #572

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Add option to keep build contexts #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions cpython-unix/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ def simple_build(
):
archive = download_entry(entry, DOWNLOADS_PATH)

with build_environment(client, image) as build_env:
with build_environment(client, image, entry) as build_env:
if settings.get("needs_toolchain"):
build_env.install_toolchain(
BUILD,
Expand Down Expand Up @@ -291,7 +291,7 @@ def build_binutils(client, image, host_platform):
"""Build binutils in the Docker image."""
archive = download_entry("binutils", DOWNLOADS_PATH)

with build_environment(client, image) as build_env:
with build_environment(client, image, "binutils") as build_env:
install_sccache(build_env)

build_env.copy_file(archive)
Expand Down Expand Up @@ -332,7 +332,7 @@ def build_musl(client, image, host_platform: str, target_triple: str, build_opti
musl = "musl-static" if static else "musl"
musl_archive = download_entry(musl, DOWNLOADS_PATH)

with build_environment(client, image) as build_env:
with build_environment(client, image, "musl") as build_env:
build_env.install_toolchain(
BUILD,
host_platform,
Expand Down Expand Up @@ -362,7 +362,7 @@ def build_libedit(
):
libedit_archive = download_entry("libedit", DOWNLOADS_PATH)

with build_environment(client, image) as build_env:
with build_environment(client, image, "libedit") as build_env:
if settings.get("needs_toolchain"):
build_env.install_toolchain(
BUILD,
Expand Down Expand Up @@ -397,7 +397,7 @@ def build_tix(
tk_archive = download_entry("tk", DOWNLOADS_PATH)
tix_archive = download_entry("tix", DOWNLOADS_PATH)

with build_environment(client, image) as build_env:
with build_environment(client, image, "tix") as build_env:
if settings.get("needs_toolchain"):
build_env.install_toolchain(
BUILD,
Expand Down Expand Up @@ -444,7 +444,7 @@ def build_cpython_host(
"""Build binutils in the Docker image."""
archive = download_entry(entry, DOWNLOADS_PATH)

with build_environment(client, image) as build_env:
with build_environment(client, image, "cpython-host") as build_env:
python_version = DOWNLOADS[entry]["version"]

build_env.install_toolchain(
Expand Down Expand Up @@ -760,7 +760,7 @@ def build_cpython(
setup_local_content = setup["setup_local"]
extra_make_content = setup["make_data"]

with build_environment(client, image) as build_env:
with build_environment(client, image, "cpython") as build_env:
if settings.get("needs_toolchain"):
build_env.install_toolchain(
BUILD,
Expand Down
13 changes: 9 additions & 4 deletions pythonbuild/buildenv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
import io
import os
import pathlib
import random
import shutil
import string
import tarfile
import tempfile

Expand Down Expand Up @@ -264,22 +266,25 @@ def find_output_files(self, base_path, pattern):


@contextlib.contextmanager
def build_environment(client, image):
def build_environment(client, image, name):
if client is not None:
suffix = "".join(random.choices(string.ascii_uppercase + string.digits, k=8))
container = client.containers.run(
image, command=["/bin/sleep", "86400"], detach=True
image, command=["/bin/sleep", "86400"], name=f"{name}-{suffix}", detach=True
)
td = None
context = ContainerContext(container)
else:
container = None
td = tempfile.TemporaryDirectory()
td = tempfile.TemporaryDirectory(prefix=f"{name}-", delete=False)
context = TempdirContext(td.name)

try:
yield context
finally:
if container:
if os.environ.get("PYBUILD_KEEP_ENV"):
pass
elif container:
container.stop(timeout=0)
container.remove()
else:
Expand Down