mirror of
https://github.com/nikdoof/cups-avahi-airprint.git
synced 2025-12-13 09:52:26 +00:00
Merge pull request #13 from chuckcharlie/buildtest
Fix airprint services bug
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
FROM alpine:3.16
|
FROM alpine:3.16
|
||||||
|
|
||||||
# Install the packages we need. Avahi will be included
|
# 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 \
|
apk add --update cups \
|
||||||
cups-libs \
|
cups-libs \
|
||||||
cups-pdf \
|
cups-pdf \
|
||||||
|
|||||||
@@ -7,4 +7,7 @@ while read -r directory events filename; do
|
|||||||
cp /etc/cups/printers.conf /config/printers.conf
|
cp /etc/cups/printers.conf /config/printers.conf
|
||||||
rsync -avh /services/ /etc/avahi/services/
|
rsync -avh /services/ /etc/avahi/services/
|
||||||
fi
|
fi
|
||||||
|
if [ "$filename" = "cupsd.conf" ]; then
|
||||||
|
cp /etc/cups/cupsd.conf /config/cupsd.conf
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
|
|||||||
@@ -30,10 +30,10 @@ if [ `ls -l /config/printers.conf 2>/dev/null | wc -l` -eq 0 ]; then
|
|||||||
fi
|
fi
|
||||||
cp /config/printers.conf /etc/cups/printers.conf
|
cp /config/printers.conf /etc/cups/printers.conf
|
||||||
|
|
||||||
if [ `ls -l /config/cupsd.conf 2>/dev/null | wc -l` -eq 0 ]; then
|
if [ `ls -l /config/cupsd.conf 2>/dev/null | wc -l` -ne 0 ]; then
|
||||||
cp /etc/cups/cupsd.conf /config/cupsd.conf
|
cp /config/cupsd.conf /etc/cups/cupsd.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
/usr/sbin/avahi-daemon --daemonize
|
/usr/sbin/avahi-daemon --daemonize
|
||||||
/root/printer-update.sh &
|
/root/printer-update.sh &
|
||||||
exec /usr/sbin/cupsd -f -c /config/cupsd.conf
|
exec /usr/sbin/cupsd -f
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
1.1.0
|
1.1.1
|
||||||
|
|||||||
Reference in New Issue
Block a user