diff --git a/Dockerfile b/Dockerfile index 874b06f..d572c1b 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 &&\ @@ -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 \ - && pip3 install pycups \ + py3-pycups \ && rm -rf /var/cache/apk/* # This will use port 631 @@ -44,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 && \ diff --git a/root/root/run_cups.sh b/root/root/run_cups.sh index e026be9..d1c9c0e 100644 --- a/root/root/run_cups.sh +++ b/root/root/run_cups.sh @@ -34,6 +34,7 @@ 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 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