Skip to content

Commit

Permalink
Merge pull request #24 from chuckcharlie:buildtest
Browse files Browse the repository at this point in the history
Updates and fixes
  • Loading branch information
chuckcharlie authored Dec 11, 2023
2 parents 7b59cee + fa00219 commit 9e1818b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
7 changes: 3 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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 &&\
Expand All @@ -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
Expand All @@ -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/<Location \/>/<Location \/>\n Allow All/' /etc/cups/cupsd.conf && \
sed -i 's/<Location \/admin>/<Location \/admin>\n Allow All\n Require user @SYSTEM/' /etc/cups/cupsd.conf && \
sed -i 's/<Location \/admin\/conf>/<Location \/admin\/conf>\n Allow All/' /etc/cups/cupsd.conf && \
Expand Down
1 change: 1 addition & 0 deletions root/root/run_cups.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.4
1.1.5

0 comments on commit 9e1818b

Please sign in to comment.