diff options
| author | Joseph Hunkeler <jhunkeler@users.noreply.github.com> | 2026-02-18 18:54:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-18 18:54:14 -0500 |
| commit | c7a6b5b8f7e535cc97fb1f8ed1ea2f55cdc28875 (patch) | |
| tree | b9c1b1215b03e59bf7b2aaf14ec12fd33fe2d3e1 /src/cli | |
| parent | d6b60205974136969212a2e415dadd773b471bc0 (diff) | |
| parent | bddde6dde420ae9d0bc6d8c2ad6865de7e90c73e (diff) | |
| download | stasis-c7a6b5b8f7e535cc97fb1f8ed1ea2f55cdc28875.tar.gz | |
Merge pull request #126 from jhunkeler/cibuildwheel
Use cibuildwheel
Diffstat (limited to 'src/cli')
| -rw-r--r-- | src/cli/stasis/stasis_main.c | 4 | ||||
| -rw-r--r-- | src/cli/stasis/system_requirements.c | 16 |
2 files changed, 12 insertions, 8 deletions
diff --git a/src/cli/stasis/stasis_main.c b/src/cli/stasis/stasis_main.c index 44ee6d7..633d014 100644 --- a/src/cli/stasis/stasis_main.c +++ b/src/cli/stasis/stasis_main.c @@ -309,6 +309,10 @@ static void install_build_package() { msg(STASIS_MSG_ERROR | STASIS_MSG_L2, "'build' tool installation failed\n"); exit(1); } + if (pip_exec("install cibuildwheel")) { + msg(STASIS_MSG_ERROR | STASIS_MSG_L2, "'cibuildwheel' tool installation failed\n"); + exit(1); + } } static void configure_package_overlay(struct Delivery *ctx, const char *env_name) { diff --git a/src/cli/stasis/system_requirements.c b/src/cli/stasis/system_requirements.c index d8d7df3..cb0ebd5 100644 --- a/src/cli/stasis/system_requirements.c +++ b/src/cli/stasis/system_requirements.c @@ -38,18 +38,18 @@ void check_system_requirements(struct Delivery *ctx) { delivery_init_tmpdir(ctx); } - struct DockerCapabilities dcap; - if (!docker_capable(&dcap)) { + if (!docker_capable(&ctx->deploy.docker.capabilities)) { + struct DockerCapabilities *dcap = &ctx->deploy.docker.capabilities; msg(STASIS_MSG_L2 | STASIS_MSG_WARN, "Docker is broken\n"); - msg(STASIS_MSG_L3, "Available: %s\n", dcap.available ? "Yes" : "No"); - msg(STASIS_MSG_L3, "Usable: %s\n", dcap.usable ? "Yes" : "No"); - msg(STASIS_MSG_L3, "Podman [Docker Emulation]: %s\n", dcap.podman ? "Yes" : "No"); + msg(STASIS_MSG_L3, "Available: %s\n", dcap->available ? "Yes" : "No"); + msg(STASIS_MSG_L3, "Usable: %s\n", dcap->usable ? "Yes" : "No"); + msg(STASIS_MSG_L3, "Podman [Docker Emulation]: %s\n", dcap->podman ? "Yes" : "No"); msg(STASIS_MSG_L3, "Build plugin(s): "); - if (dcap.usable) { - if (dcap.build & STASIS_DOCKER_BUILD) { + if (dcap->usable) { + if (dcap->build & STASIS_DOCKER_BUILD) { printf("build "); } - if (dcap.build & STASIS_DOCKER_BUILD_X) { + if (dcap->build & STASIS_DOCKER_BUILD_X) { printf("buildx "); } puts(""); |