meatbag/baseimage-alpine
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix apk path

Browse source
This commit is contained in:
TheSpad 2022-07-29 17:23:40 +01:00
parent 590130ad99
commit e76811827f
No known key found for this signature in database
GPG key ID: 08F06191F4587860
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
root/etc/s6-overlay/s6-rc.d/init-mods-package-install/run
View file

@ -7,7 +7,7 @@ if [ -f "/mod-repo-packages-to-install.list" ]; then
apt-get update apt-get update
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
$(cat /mod-repo-packages-to-install.list) $(cat /mod-repo-packages-to-install.list)
elif [ -f /usr/bin/apk ]; then elif [ -f /sbin/apk ]; then
apk add --no-cache \ apk add --no-cache \
$(cat /mod-repo-packages-to-install.list) $(cat /mod-repo-packages-to-install.list)
fi fi
@ -20,7 +20,7 @@ if [ -f "/mod-pip-packages-to-install.list" ]; then
python3 -m pip install -U pip wheel setuptools python3 -m pip install -U pip wheel setuptools
if [ -f /usr/bin/apt ]; then if [ -f /usr/bin/apt ]; then
PIP_ARGS="-f https://wheel-index.linuxserver.io/ubuntu/" PIP_ARGS="-f https://wheel-index.linuxserver.io/ubuntu/"
elif [ -f /usr/bin/apk ]; then elif [ -f /sbin/apk ]; then
ALPINE_VER=$(grep main /etc/apk/repositories | sed 's|.*alpine/v||' | sed 's|/main.*||') ALPINE_VER=$(grep main /etc/apk/repositories | sed 's|.*alpine/v||' | sed 's|/main.*||')
if [ "${ALPINE_VER}" = "3.14" ]; then if [ "${ALPINE_VER}" = "3.14" ]; then
PIP_ARGS="-f https://wheel-index.linuxserver.io/alpine/" PIP_ARGS="-f https://wheel-index.linuxserver.io/alpine/"