From d2d2a076b5e3e3fbeb7085754adf23fdee7514b6 Mon Sep 17 00:00:00 2001
From: sthope <rjs.ricardosilva@gmail.com>
Date: Sun, 10 Jul 2022 16:20:25 +0200
Subject: [PATCH] First commit

---
 Dockerfile           | 11 +++----
 docker-entrypoint.sh |  2 +-
 old                  | 70 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 77 insertions(+), 6 deletions(-)
 create mode 100644 old

diff --git a/Dockerfile b/Dockerfile
index 141e2ca..3ec71ab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,7 @@ ARG BUILD_DATE
 
 # environment
 ENV ADMIN_PASSWORD=admin
+ENV ADMIN_USERNAME=admin
 
 # labels
 LABEL maintainer="Sthope <hopelessautomations@gmail.com>" \
@@ -37,13 +38,13 @@ RUN apt-get update \
   && rm -rf /var/lib/apt/lists/*
 
 # add print user
-RUN adduser --home /home/admin --shell /bin/bash --gecos "admin" --disabled-password admin \
-  && adduser admin sudo \
-  && adduser admin lp \
-  && adduser admin lpadmin
+RUN adduser --home /home/${ADMIN_USERNAME} --shell /bin/bash --gecos "${ADMIN_USERNAME}" --disabled-password ${ADMIN_USERNAME} \
+  && adduser ${ADMIN_USERNAME} sudo \
+  && adduser ${ADMIN_USERNAME} lp \
+  && adduser ${ADMIN_USERNAME} lpadmin
 
 # disable sudo password checking
-RUN echo 'admin ALL=(ALL:ALL) ALL' >> /etc/sudoers
+RUN echo '${ADMIN_USERNAME} ALL=(ALL:ALL) ALL' >> /etc/sudoers
 
 # enable access to CUPS
 RUN /usr/sbin/cupsd \
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 482ac22..3ae855c 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-echo -e "${ADMIN_PASSWORD}\n${ADMIN_PASSWORD}" | passwd admin
+echo -e "${ADMIN_PASSWORD}\n${ADMIN_PASSWORD}" | passwd ${ADMIN_USERNAME}
 
 if [ ! -f /etc/cups/cupsd.conf ]; then
   cp -rpn /etc/cups-skel/* /etc/cups/
diff --git a/old b/old
new file mode 100644
index 0000000..7382fe0
--- /dev/null
+++ b/old
@@ -0,0 +1,70 @@
+# base image
+ARG ARCH=amd64
+FROM $ARCH/debian:bullseye-slim
+
+# args
+ARG VCS_REF
+ARG BUILD_DATE
+
+# environment
+ENV ADMIN_PASSWORD=admin
+ENV ADMIN_USERNAME=admin
+
+# labels
+LABEL maintainer="Sthope <hopelessautomations@gmail.com>" \
+  org.label-schema.schema-version="1.0" \
+  org.label-schema.name="sthopeless/cups" \
+  org.label-schema.description="Simple CUPS docker image" \
+  org.label-schema.version="0.1" \
+  org.label-schema.url="https://hub.docker.com/r/sthopeless/cups" \
+  org.label-schema.vcs-url="https://git.sthope.dev/sthope/Docker-cups" \
+  org.label-schema.vcs-ref=$VCS_REF \
+  org.label-schema.build-date=$BUILD_DATE
+
+# install packages
+RUN apt-get update \
+  && apt-get install -y \
+  sudo \
+  cups \
+  cups-bsd \
+  cups-filters \
+  foomatic-db-compressed-ppds \
+  printer-driver-all \
+  openprinting-ppds \
+  hpijs-ppds \
+  hp-ppd \
+  hplip \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/*
+
+# add print user
+RUN adduser --home /home/admin --shell /bin/bash --gecos "admin" --disabled-password admin \
+  && adduser admin sudo \
+  && adduser admin lp \
+  && adduser admin lpadmin
+
+# disable sudo password checking
+RUN echo 'admin ALL=(ALL:ALL) ALL' >> /etc/sudoers
+
+# enable access to CUPS
+RUN /usr/sbin/cupsd \
+  && while [ ! -f /var/run/cups/cupsd.pid ]; do sleep 1; done \
+  && cupsctl --remote-admin --remote-any --share-printers \
+  && kill $(cat /var/run/cups/cupsd.pid) \
+  && echo "ServerAlias *" >> /etc/cups/cupsd.conf
+
+# copy /etc/cups for skeleton usage
+RUN cp -rp /etc/cups /etc/cups-skel
+
+# entrypoint
+ADD docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+ENTRYPOINT [ "docker-entrypoint.sh" ]
+
+# default command
+CMD ["cupsd", "-f"]
+
+# volumes
+VOLUME ["/etc/cups"]
+
+# ports
+EXPOSE 631
\ No newline at end of file