From f09a048c799a8e576e5cb8e9ee605fb94400b7d0 Mon Sep 17 00:00:00 2001
From: Florian Zirker <florian.zirker@kapsweyer.de>
Date: Sat, 12 Nov 2022 14:26:57 +0100
Subject: [PATCH 1/2] Print Server aktualisiert

---
 print/Dockerfile          |  2 --
 print/docker-compose.yaml | 11 ++---------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/print/Dockerfile b/print/Dockerfile
index 1ea1351..e86626d 100644
--- a/print/Dockerfile
+++ b/print/Dockerfile
@@ -1,6 +1,4 @@
-ARG MAINTAINER
 FROM debian:bullseye
-MAINTAINER $MAINTAINER
 
 # Install Packages (basic tools, cups, basic drivers, HP drivers)
 RUN apt-get update \
diff --git a/print/docker-compose.yaml b/print/docker-compose.yaml
index bd1f2e0..7740629 100644
--- a/print/docker-compose.yaml
+++ b/print/docker-compose.yaml
@@ -3,7 +3,8 @@ version: "3.3"
 services:
 
   cups:
-    image: olbat/cupsd
+    build: .
+    image: cupsd
     volumes:
       - /var/run/dbus:/var/run/dbus
       - ${VOLUMES_PATH}/cups:/etc/cups
@@ -11,10 +12,6 @@ services:
       - /dev/usblp0
     privileged: true
     network_mode: host
-#    networks:
-#      - web
-#    ports:
-#      - 631:631
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.cups.rule=Host(`print.${DOMAIN}`)"
@@ -23,7 +20,3 @@ services:
       - "docker.group=print"
     restart: unless-stopped
 
-networks:
-  web:
-    external: true
-

From d3f687ea90c278e0960ad3e127ebe71fc53b15af Mon Sep 17 00:00:00 2001
From: Florian Zirker <florian.zirker@kapsweyer.de>
Date: Sat, 12 Nov 2022 14:31:35 +0100
Subject: [PATCH 2/2] Skripte angepasst

---
 pull-all.sh | 4 ++++
 pull-min.sh | 9 +++++++++
 2 files changed, 13 insertions(+)
 create mode 100755 pull-min.sh

diff --git a/pull-all.sh b/pull-all.sh
index 369015c..e29394f 100755
--- a/pull-all.sh
+++ b/pull-all.sh
@@ -1,5 +1,9 @@
 #/bin/bash/
 
+for dir in ./*/ ; do
+   (cd "$dir" && echo "[$dir]" && docker-compose build);
+done
+
 for dir in ./*/ ; do
    (cd "$dir" && echo "[$dir]" && docker-compose pull);
 done
diff --git a/pull-min.sh b/pull-min.sh
new file mode 100755
index 0000000..26f6b61
--- /dev/null
+++ b/pull-min.sh
@@ -0,0 +1,9 @@
+#/bin/bash/
+
+function pull {
+   (cd "$1" && echo "[$1]" && docker-compose pull);
+}
+
+pull proxy;
+pull telegraf;
+pull portainer;