From f8f67d34244d056935520c9ddde1e5db971c1fd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 31 Aug 2023 19:17:24 +0300 Subject: [PATCH 1/3] Build missing wheels only if needed Apparently there's wheel now for x86_64: > PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 472ec336531..869c35c94b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,10 @@ RUN \ # Build missing wheels RUN \ --mount=type=cache,id=pip,target=/root/.cache/pip \ - pip wheel $(ls /wheels/*.gz /wheels/*.zip 2>/dev/null) --wheel-dir=/wheels +</dev/null) + test -n "${1:-}" && pip wheel $(ls /wheels/*.gz /wheels/*.zip 2>/dev/null) --wheel-dir=/wheels +eot # Install app dependencies FROM base AS build From c767b4af26a314a67bb8ed865e9543e7da709aba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 31 Aug 2023 19:22:47 +0300 Subject: [PATCH 2/3] Avoid duplicate ls --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 869c35c94b2..c405a2cf8db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ RUN \ --mount=type=cache,id=pip,target=/root/.cache/pip \ </dev/null) - test -n "${1:-}" && pip wheel $(ls /wheels/*.gz /wheels/*.zip 2>/dev/null) --wheel-dir=/wheels + test -n "${1:-}" && pip wheel "$@" --wheel-dir=/wheels eot # Install app dependencies From a3016e540e93dc80fd77387f1a39ab7630bb25c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 31 Aug 2023 20:09:48 +0300 Subject: [PATCH 3/3] Fix exit condition --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c405a2cf8db..41da89020fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,8 +23,11 @@ RUN \ RUN \ --mount=type=cache,id=pip,target=/root/.cache/pip \ </dev/null) - test -n "${1:-}" && pip wheel "$@" --wheel-dir=/wheels + if [ $# -gt 0 ]; then + pip wheel "$@" --wheel-dir=/wheels + fi eot # Install app dependencies