diff --git a/Dockerfile b/Dockerfile index 9f8b058..de38596 100644 --- a/Dockerfile +++ b/Dockerfile @@ -233,6 +233,7 @@ RUN \ chmod -R g+w /usr/local && \ groupadd lsio && \ groupmod -g 7310 lsio && \ + mv /usr/local/lib/python3.12 /usr/local/lib/python3.12.bak && \ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apk del --purge \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 12cf4af..94c62d8 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -233,6 +233,7 @@ RUN \ chmod -R g+w /usr/local && \ groupadd lsio && \ groupmod -g 7310 lsio && \ + mv /usr/local/lib/python3.12 /usr/local/lib/python3.12.bak && \ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apk del --purge \ diff --git a/Jenkinsfile b/Jenkinsfile index 426e6a0..70a13fd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,7 +34,7 @@ pipeline { CI_WEB = 'true' CI_PORT = '8123' CI_SSL = 'false' - CI_DELAY = '120' + CI_DELAY = '240' CI_DOCKERENV = 'TZ=Europe/London' CI_AUTH = '' CI_WEBPATH = '' diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 0140e05..3473b85 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -23,7 +23,7 @@ repo_vars: - CI_WEB = 'true' - CI_PORT = '8123' - CI_SSL = 'false' - - CI_DELAY = '120' + - CI_DELAY = '240' - CI_DOCKERENV = 'TZ=Europe/London' - CI_AUTH = '' - CI_WEBPATH = '' diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-homeassistant/run b/root/etc/s6-overlay/s6-rc.d/init-config-homeassistant/run index f32ae8d..a9cde16 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-config-homeassistant/run +++ b/root/etc/s6-overlay/s6-rc.d/init-config-homeassistant/run @@ -10,7 +10,14 @@ rm -rf \ if ! id -G abc | grep -qw "7310"; then usermod -a -G lsio abc fi - +PUID=${PUID:-911} +PY_LOCAL_PATH=$(find /usr/local/lib -maxdepth 1 -name python* -type d) +PY_LOCAL_PATH="${PY_LOCAL_PATH%.bak}" +if [[ -d "${PY_LOCAL_PATH}.bak" ]]; then + echo "**** New container detected, fixing python package permissions. This may take a while. ****" + mv "${PY_LOCAL_PATH}.bak" "${PY_LOCAL_PATH}" + chown -R abc:abc "${PY_LOCAL_PATH}" +fi # set permissions echo "Setting permissions" lsiown -R abc:abc \