From 4f7e3763e9aedd371efe19d5d33eefb24a6c2baa Mon Sep 17 00:00:00 2001 From: hodge Date: Sun, 8 Dec 2024 16:50:54 +0800 Subject: [PATCH 1/8] Update 04-update-crontabs --- rootfs/etc/cont-init.d/04-update-crontabs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootfs/etc/cont-init.d/04-update-crontabs b/rootfs/etc/cont-init.d/04-update-crontabs index fd84b36..7674290 100755 --- a/rootfs/etc/cont-init.d/04-update-crontabs +++ b/rootfs/etc/cont-init.d/04-update-crontabs @@ -37,7 +37,7 @@ if [[ "$EXECUTE_CRON" = "true" ]] && [[ -f "${USERS_CONF}" ]]; then schedule=$(echo "${row}" | jq -r 'to_entries|map("\(.value|tostring)")|.[]') echo "Found schedule for command ${cmd}: ${schedule}" - echo "${schedule} /usr/local/bin/nut-api -a \"${CRONTAB_USER}\" -c \"${cmd}\"" >/etc/crontabs/root + echo "${schedule} /usr/local/bin/nut-api -a \"${CRONTAB_USER}\" -c \"${cmd}\"" >> /etc/crontabs/root echo "Added ${cmd} schedule to /etc/crontabs/root..." done else From 05e5bf47d9c51a4b800c533c89a6c8a4f3c07f0f Mon Sep 17 00:00:00 2001 From: hodge Date: Sun, 8 Dec 2024 19:41:11 +0800 Subject: [PATCH 2/8] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 15ab7dd..fb68305 100644 --- a/Dockerfile +++ b/Dockerfile @@ -101,7 +101,7 @@ RUN \ python3 -m venv venv && \ source venv/bin/activate && \ echo "Building wheels for requirements..." && \ - pip3 install -r requirements.txt && \ + pip3 install --only-binary -r requirements.txt && \ echo "Creating volume directories..." && \ mv -v conf conf_template && \ mkdir -p conf _NSPOUT titles && \ From 21d75d8bbbb0e4ae7c7c3cc791370e6ad1f7e9d1 Mon Sep 17 00:00:00 2001 From: hodge Date: Sun, 8 Dec 2024 19:58:49 +0800 Subject: [PATCH 3/8] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fb68305..6595495 100644 --- a/Dockerfile +++ b/Dockerfile @@ -101,7 +101,7 @@ RUN \ python3 -m venv venv && \ source venv/bin/activate && \ echo "Building wheels for requirements..." && \ - pip3 install --only-binary -r requirements.txt && \ + pip3 install --only-binary :all: -r requirements.txt && \ echo "Creating volume directories..." && \ mv -v conf conf_template && \ mkdir -p conf _NSPOUT titles && \ From ea7e74f30e8c0c71bc3519e168fe12f56a806d0b Mon Sep 17 00:00:00 2001 From: hodge Date: Sun, 8 Dec 2024 20:10:38 +0800 Subject: [PATCH 4/8] Update Dockerfile --- Dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6595495..87dc46d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -88,20 +88,18 @@ RUN \ echo "Extracting nut..." && \ tar xzf /tmp/nut.tar.gz --strip-components=1 -C /nut && \ echo "Upgrading pip..." && \ - pip3 install --upgrade pip && \ + pip install --upgrade pip && \ echo "Removing pyqt5 from requirements.txt since we have no gui..." && \ sed -i '/pyqt5/d' requirements.txt && \ sed -i '/qt-range-slider/d' requirements.txt && \ echo "Fixing markupsafe issue..." && \ echo "markupsafe==2.0.1" >> requirements.txt && \ - echo "Upgrading pip..." && \ - pip3 install --upgrade pip && \ echo "Setup venv..." && \ - pip3 install virtualenv && \ + pip install virtualenv && \ python3 -m venv venv && \ source venv/bin/activate && \ echo "Building wheels for requirements..." && \ - pip3 install --only-binary :all: -r requirements.txt && \ + pip install -r requirements.txt && \ echo "Creating volume directories..." && \ mv -v conf conf_template && \ mkdir -p conf _NSPOUT titles && \ From e355763b7d1117c335a339f8fcbe68d313d3a700 Mon Sep 17 00:00:00 2001 From: hodge Date: Sun, 8 Dec 2024 20:17:08 +0800 Subject: [PATCH 5/8] Update Dockerfile --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 87dc46d..93a1f4c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -98,6 +98,8 @@ RUN \ pip install virtualenv && \ python3 -m venv venv && \ source venv/bin/activate && \ + echo "Upgrading pip..." && \ + pip install --upgrade pip && \ echo "Building wheels for requirements..." && \ pip install -r requirements.txt && \ echo "Creating volume directories..." && \ From 489507bb05548a11b6c1eacb4a606bfb6bda9ff7 Mon Sep 17 00:00:00 2001 From: hodge Date: Sun, 8 Dec 2024 20:38:49 +0800 Subject: [PATCH 6/8] Update Dockerfile --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 93a1f4c..968b561 100644 --- a/Dockerfile +++ b/Dockerfile @@ -88,20 +88,20 @@ RUN \ echo "Extracting nut..." && \ tar xzf /tmp/nut.tar.gz --strip-components=1 -C /nut && \ echo "Upgrading pip..." && \ - pip install --upgrade pip && \ + pip3 install --upgrade pip && \ echo "Removing pyqt5 from requirements.txt since we have no gui..." && \ sed -i '/pyqt5/d' requirements.txt && \ sed -i '/qt-range-slider/d' requirements.txt && \ echo "Fixing markupsafe issue..." && \ echo "markupsafe==2.0.1" >> requirements.txt && \ echo "Setup venv..." && \ - pip install virtualenv && \ + pip3 install virtualenv && \ python3 -m venv venv && \ source venv/bin/activate && \ echo "Upgrading pip..." && \ - pip install --upgrade pip && \ + pip3 install --upgrade pip && \ echo "Building wheels for requirements..." && \ - pip install -r requirements.txt && \ + pip3 install -r requirements.txt && \ echo "Creating volume directories..." && \ mv -v conf conf_template && \ mkdir -p conf _NSPOUT titles && \ From bba1971f3f7f25fb8634b27c54918fde1aa8c642 Mon Sep 17 00:00:00 2001 From: hodge Date: Sun, 8 Dec 2024 20:48:26 +0800 Subject: [PATCH 7/8] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 968b561..b730d53 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ # # Set python image version -ARG PYTHON_VERSION=3.10-alpine3.15 +ARG PYTHON_VERSION=3.10-alpine3.18 # Set vars for s6 overlay ARG S6_OVERLAY_VERSION=v2.2.0.3 From 72793462a4f0e3b997119a6488550b973fb8af8c Mon Sep 17 00:00:00 2001 From: hodge Date: Sun, 8 Dec 2024 20:55:22 +0800 Subject: [PATCH 8/8] Update Dockerfile --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b730d53..2864ff5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -69,7 +69,6 @@ RUN \ git \ build-base \ libusb-dev \ - libressl-dev \ libffi-dev \ curl-dev \ jpeg-dev \