From 314f76840d5310aebd012c453c363f80531dfce4 Mon Sep 17 00:00:00 2001 From: chuckcharlie Date: Sat, 9 Dec 2023 13:52:45 -0700 Subject: [PATCH 1/9] Update Alpine base to 3.19 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 874b06f..4073525 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18 +FROM alpine:3.19 # Install the packages we need. Avahi will be included RUN echo -e "https://dl-cdn.alpinelinux.org/alpine/edge/testing\nhttps://dl-cdn.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories &&\ From 9f180c44e938d694b2fe7cabfe40eeb735bd0edd Mon Sep 17 00:00:00 2001 From: chuckcharlie Date: Sat, 9 Dec 2023 14:46:25 -0700 Subject: [PATCH 2/9] Force pip3 pycups install --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4073525..298c5f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ RUN echo -e "https://dl-cdn.alpinelinux.org/alpine/edge/testing\nhttps://dl-cdn. wget \ rsync \ && pip3 --no-cache-dir install --upgrade pip \ - && pip3 install pycups \ + && pip3 install pycups --break-system-packages \ && rm -rf /var/cache/apk/* # This will use port 631 From a147a393bad751a9f766cad1752f4499d2ad721c Mon Sep 17 00:00:00 2001 From: chuckcharlie Date: Sat, 9 Dec 2023 14:52:53 -0700 Subject: [PATCH 3/9] Pip --break-system-packages --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 298c5f8..6674b33 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ RUN echo -e "https://dl-cdn.alpinelinux.org/alpine/edge/testing\nhttps://dl-cdn. build-base \ wget \ rsync \ - && pip3 --no-cache-dir install --upgrade pip \ + && pip3 --no-cache-dir install --upgrade pip --break-system-packages \ && pip3 install pycups --break-system-packages \ && rm -rf /var/cache/apk/* From 7fc14363f07bb741afafb37e0e4b6a70941fbeb5 Mon Sep 17 00:00:00 2001 From: chuckcharlie Date: Sat, 9 Dec 2023 15:06:42 -0700 Subject: [PATCH 4/9] remove pip install in favor of native package --- Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6674b33..13eda45 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,12 +19,10 @@ RUN echo -e "https://dl-cdn.alpinelinux.org/alpine/edge/testing\nhttps://dl-cdn. inotify-tools \ python3 \ python3-dev \ - py3-pip \ build-base \ wget \ rsync \ - && pip3 --no-cache-dir install --upgrade pip --break-system-packages \ - && pip3 install pycups --break-system-packages \ + py3-pycups \ && rm -rf /var/cache/apk/* # This will use port 631 From 572a37f4841d020a18c0d99a50f38a9d2e8e24cf Mon Sep 17 00:00:00 2001 From: chuckcharlie Date: Sat, 9 Dec 2023 15:16:32 -0700 Subject: [PATCH 5/9] Update version.txt --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 65087b4..e25d8d9 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.1.4 +1.1.5 From 167c8f5c06263b12523a7ce7f63265918faed70c Mon Sep 17 00:00:00 2001 From: chuckcharlie Date: Sat, 9 Dec 2023 15:55:44 -0700 Subject: [PATCH 6/9] remove avahi for test --- root/root/run_cups.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/root/run_cups.sh b/root/root/run_cups.sh index e026be9..239fe77 100644 --- a/root/root/run_cups.sh +++ b/root/root/run_cups.sh @@ -34,6 +34,6 @@ if [ `ls -l /config/cupsd.conf 2>/dev/null | wc -l` -ne 0 ]; then cp /config/cupsd.conf /etc/cups/cupsd.conf fi -/usr/sbin/avahi-daemon --daemonize + /root/printer-update.sh & exec /usr/sbin/cupsd -f From a185478c3d9a3c3eadda653740cb20fd96cbb158 Mon Sep 17 00:00:00 2001 From: chuckcharlie Date: Sun, 10 Dec 2023 10:02:04 -0700 Subject: [PATCH 7/9] remove updat cups command for troublshooting --- root/root/run_cups.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/root/root/run_cups.sh b/root/root/run_cups.sh index 239fe77..57c42fd 100644 --- a/root/root/run_cups.sh +++ b/root/root/run_cups.sh @@ -35,5 +35,4 @@ if [ `ls -l /config/cupsd.conf 2>/dev/null | wc -l` -ne 0 ]; then fi -/root/printer-update.sh & -exec /usr/sbin/cupsd -f +/root/printer-update.sh From 3a29e24926a2470064e6a2d638c666629bea435a Mon Sep 17 00:00:00 2001 From: chuckcharlie Date: Sun, 10 Dec 2023 13:24:24 -0700 Subject: [PATCH 8/9] Remove idleexittimeout --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 13eda45..d572c1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,6 +42,7 @@ CMD ["/root/run_cups.sh"] # Baked-in config file changes RUN sed -i 's/Listen localhost:631/Listen 0.0.0.0:631/' /etc/cups/cupsd.conf && \ sed -i 's/Browsing Off/Browsing On/' /etc/cups/cupsd.conf && \ + sed -i 's/IdleExitTimeout/#IdleExitTimeout/' /etc/cups/cupsd.conf && \ sed -i 's//\n Allow All/' /etc/cups/cupsd.conf && \ sed -i 's//\n Allow All\n Require user @SYSTEM/' /etc/cups/cupsd.conf && \ sed -i 's//\n Allow All/' /etc/cups/cupsd.conf && \ From fa0021988136a809fcb3a65577d89432db2de961 Mon Sep 17 00:00:00 2001 From: chuckcharlie Date: Sun, 10 Dec 2023 13:28:17 -0700 Subject: [PATCH 9/9] add back run commands --- root/root/run_cups.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/root/root/run_cups.sh b/root/root/run_cups.sh index 57c42fd..d1c9c0e 100644 --- a/root/root/run_cups.sh +++ b/root/root/run_cups.sh @@ -35,4 +35,6 @@ if [ `ls -l /config/cupsd.conf 2>/dev/null | wc -l` -ne 0 ]; then fi -/root/printer-update.sh +/usr/sbin/avahi-daemon --daemonize +/root/printer-update.sh & +exec /usr/sbin/cupsd -f