Merge pull request #13 from chuckcharlie/buildtest

Fix airprint services bug
This commit is contained in:
chuckcharlie
2022-10-17 12:13:47 -06:00
committed by GitHub
4 changed files with 8 additions and 5 deletions

View File

@@ -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 \

View File

@@ -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

View File

@@ -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

View File

@@ -1 +1 @@
1.1.0
1.1.1