diff --git a/Dockerfile b/Dockerfile index f094a49..65a86be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.16 # Install the packages we need. Avahi will be included -RUN echo -e "http://nl.alpinelinux.org/alpine/edge/testing\nhttp://dl-cdn.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories &&\ +RUN echo -e "https://dl-cdn.alpinelinux.org/alpine/edge/testing\nhttps://dl-cdn.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories &&\ apk add --update cups \ cups-libs \ cups-pdf \ diff --git a/root/root/printer-update.sh b/root/root/printer-update.sh index 3735e58..466a9fa 100644 --- a/root/root/printer-update.sh +++ b/root/root/printer-update.sh @@ -7,4 +7,7 @@ while read -r directory events filename; do cp /etc/cups/printers.conf /config/printers.conf rsync -avh /services/ /etc/avahi/services/ fi + if [ "$filename" = "cupsd.conf" ]; then + cp /etc/cups/cupsd.conf /config/cupsd.conf + fi done diff --git a/root/root/run_cups.sh b/root/root/run_cups.sh index 61542a9..e026be9 100644 --- a/root/root/run_cups.sh +++ b/root/root/run_cups.sh @@ -30,10 +30,10 @@ if [ `ls -l /config/printers.conf 2>/dev/null | wc -l` -eq 0 ]; then fi cp /config/printers.conf /etc/cups/printers.conf -if [ `ls -l /config/cupsd.conf 2>/dev/null | wc -l` -eq 0 ]; then - cp /etc/cups/cupsd.conf /config/cupsd.conf +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 -c /config/cupsd.conf +exec /usr/sbin/cupsd -f diff --git a/version.txt b/version.txt index 9084fa2..524cb55 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.1.0 +1.1.1