Skip to content

Commit a7d10fc

Browse files
committed
fixup! Add image for musllinux_1_1 policy
1 parent 09c4495 commit a7d10fc

File tree

4 files changed

+21
-13
lines changed

4 files changed

+21
-13
lines changed

docker/build_scripts/finalize.sh

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,12 @@ source $TOOLS_PATH/bin/activate
4343

4444
# Install default packages
4545
pip install -U --require-hashes -r $MY_DIR/requirements3.9.txt
46-
# Install certifi and auditwheel
4746

47+
# Install common tools
4848
if [ "${POLICY}" == "musllinux_1_1" ]; then
49-
# On Alpine cmake needs cmake to build. Install it from apk to
50-
# build a newer version.
51-
apk add --no-cache --virtual .cmake-deps cmake openssl-dev
52-
fi
53-
54-
pip install -U --require-hashes -r $MY_DIR/requirements-tools.txt
55-
56-
if [ "${POLICY}" == "musllinux_1_1" ]; then
57-
# Remove the apk version
58-
apk del .cmake-deps
49+
pip install -U --require-hashes -r $MY_DIR/requirements-tools-musllinux.txt
50+
else
51+
pip install -U --require-hashes -r $MY_DIR/requirements-tools-manylinux.txt
5952
fi
6053

6154
# Make auditwheel available in PATH

noxfile.py

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,20 @@ def tools(session):
2323
session.run(
2424
"pip-compile",
2525
"--generate-hashes",
26-
"requirements-tools.in",
26+
"requirements-tools-manylinux.in",
2727
"--upgrade",
2828
"--output-file",
29-
f"docker/build_scripts/requirements-tools.txt",
29+
f"docker/build_scripts/requirements-tools-manylinux.txt",
30+
)
31+
32+
@nox.session(python="3.9")
33+
def tools(session):
34+
session.install("pip-tools")
35+
session.run(
36+
"pip-compile",
37+
"--generate-hashes",
38+
"requirements-tools-musllinux.in",
39+
"--upgrade",
40+
"--output-file",
41+
f"docker/build_scripts/requirements-tools-musllinux.txt",
3042
)
File renamed without changes.

requirements-tools-musllinux.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
auditwheel
2+
certifi
3+
pipx

0 commit comments

Comments
 (0)