From e617e1a64eb74d74319f19123c974dc4e2f015cf Mon Sep 17 00:00:00 2001
From: Laszlo Kiss-Kollar <kiss.kollar.laszlo@gmail.com>
Date: Mon, 19 Jul 2021 21:14:17 +0100
Subject: [PATCH] fixup! Add image for musllinux_1_1 policy

---
 docker/build_scripts/finalize.sh                  | 15 ++++-----------
 noxfile.py                                        | 12 ++++++++++--
 ...ts-tools.in => requirements-tools-manylinux.in |  0
 requirements-tools-musllinux.in                   |  3 +++
 4 files changed, 17 insertions(+), 13 deletions(-)
 rename requirements-tools.in => requirements-tools-manylinux.in (100%)
 create mode 100644 requirements-tools-musllinux.in

diff --git a/docker/build_scripts/finalize.sh b/docker/build_scripts/finalize.sh
index fa7cfc3a6..7094bbb39 100755
--- a/docker/build_scripts/finalize.sh
+++ b/docker/build_scripts/finalize.sh
@@ -43,19 +43,12 @@ source $TOOLS_PATH/bin/activate
 
 # Install default packages
 pip install -U --require-hashes -r $MY_DIR/requirements3.9.txt
-# Install certifi and auditwheel
 
+# Install common tools
 if [ "${POLICY}" == "musllinux_1_1" ]; then
-    # On Alpine cmake needs cmake to build. Install it from apk to
-    # build a newer version.
-    apk add --no-cache --virtual .cmake-deps cmake openssl-dev
-fi
-
-pip install -U --require-hashes -r $MY_DIR/requirements-tools.txt
-
-if [ "${POLICY}" == "musllinux_1_1" ]; then
-    # Remove the apk version
-    apk del .cmake-deps
+    pip install -U --require-hashes -r $MY_DIR/requirements-tools-musllinux.txt
+else
+    pip install -U --require-hashes -r $MY_DIR/requirements-tools-manylinux.txt
 fi
 
 # Make auditwheel available in PATH
diff --git a/noxfile.py b/noxfile.py
index b344002bb..d355f5935 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -23,8 +23,16 @@ def tools(session):
     session.run(
         "pip-compile",
         "--generate-hashes",
-        "requirements-tools.in",
+        "requirements-tools-manylinux.in",
         "--upgrade",
         "--output-file",
-        f"docker/build_scripts/requirements-tools.txt",
+        f"docker/build_scripts/requirements-tools-manylinux.txt",
+    )
+    session.run(
+        "pip-compile",
+        "--generate-hashes",
+        "requirements-tools-musllinux.in",
+        "--upgrade",
+        "--output-file",
+        f"docker/build_scripts/requirements-tools-musllinux.txt",
     )
diff --git a/requirements-tools.in b/requirements-tools-manylinux.in
similarity index 100%
rename from requirements-tools.in
rename to requirements-tools-manylinux.in
diff --git a/requirements-tools-musllinux.in b/requirements-tools-musllinux.in
new file mode 100644
index 000000000..d5fd982b7
--- /dev/null
+++ b/requirements-tools-musllinux.in
@@ -0,0 +1,3 @@
+auditwheel
+certifi
+pipx