Skip to content

Commit b77dbd4

Browse files
authored
Merge pull request #112 from linuxserver/chown
chown system python packages
2 parents 64ed6e4 + 1a717bc commit b77dbd4

File tree

5 files changed

+12
-3
lines changed

5 files changed

+12
-3
lines changed

Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ RUN \
233233
chmod -R g+w /usr/local && \
234234
groupadd lsio && \
235235
groupmod -g 7310 lsio && \
236+
mv /usr/local/lib/python3.12 /usr/local/lib/python3.12.bak && \
236237
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
237238
echo "**** cleanup ****" && \
238239
apk del --purge \

Dockerfile.aarch64

+1
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ RUN \
233233
chmod -R g+w /usr/local && \
234234
groupadd lsio && \
235235
groupmod -g 7310 lsio && \
236+
mv /usr/local/lib/python3.12 /usr/local/lib/python3.12.bak && \
236237
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
237238
echo "**** cleanup ****" && \
238239
apk del --purge \

Jenkinsfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ pipeline {
3434
CI_WEB = 'true'
3535
CI_PORT = '8123'
3636
CI_SSL = 'false'
37-
CI_DELAY = '120'
37+
CI_DELAY = '240'
3838
CI_DOCKERENV = 'TZ=Europe/London'
3939
CI_AUTH = ''
4040
CI_WEBPATH = ''

jenkins-vars.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ repo_vars:
2323
- CI_WEB = 'true'
2424
- CI_PORT = '8123'
2525
- CI_SSL = 'false'
26-
- CI_DELAY = '120'
26+
- CI_DELAY = '240'
2727
- CI_DOCKERENV = 'TZ=Europe/London'
2828
- CI_AUTH = ''
2929
- CI_WEBPATH = ''

root/etc/s6-overlay/s6-rc.d/init-config-homeassistant/run

+8-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@ rm -rf \
1010
if ! id -G abc | grep -qw "7310"; then
1111
usermod -a -G lsio abc
1212
fi
13-
13+
PUID=${PUID:-911}
14+
PY_LOCAL_PATH=$(find /usr/local/lib -maxdepth 1 -name python* -type d)
15+
PY_LOCAL_PATH="${PY_LOCAL_PATH%.bak}"
16+
if [[ -d "${PY_LOCAL_PATH}.bak" ]]; then
17+
echo "**** New container detected, fixing python package permissions. This may take a while. ****"
18+
mv "${PY_LOCAL_PATH}.bak" "${PY_LOCAL_PATH}"
19+
chown -R abc:abc "${PY_LOCAL_PATH}"
20+
fi
1421
# set permissions
1522
echo "Setting permissions"
1623
lsiown -R abc:abc \

0 commit comments

Comments
 (0)