Skip to content

Commit

Permalink
fixup! Add image for musllinux_1_1 policy
Browse files Browse the repository at this point in the history
  • Loading branch information
lkollar committed Jul 19, 2021
1 parent 58e1d1b commit e617e1a
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 13 deletions.
15 changes: 4 additions & 11 deletions docker/build_scripts/finalize.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 10 additions & 2 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
)
File renamed without changes.
3 changes: 3 additions & 0 deletions requirements-tools-musllinux.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
auditwheel
certifi
pipx

0 comments on commit e617e1a

Please sign in to comment.