diff --git a/print/Dockerfile b/print/Dockerfile index e86626d..1ea1351 100644 --- a/print/Dockerfile +++ b/print/Dockerfile @@ -1,4 +1,6 @@ +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 7740629..bd1f2e0 100644 --- a/print/docker-compose.yaml +++ b/print/docker-compose.yaml @@ -3,8 +3,7 @@ version: "3.3" services: cups: - build: . - image: cupsd + image: olbat/cupsd volumes: - /var/run/dbus:/var/run/dbus - ${VOLUMES_PATH}/cups:/etc/cups @@ -12,6 +11,10 @@ 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}`)" @@ -20,3 +23,7 @@ services: - "docker.group=print" restart: unless-stopped +networks: + web: + external: true + diff --git a/pull-all.sh b/pull-all.sh index e29394f..369015c 100755 --- a/pull-all.sh +++ b/pull-all.sh @@ -1,9 +1,5 @@ #/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 deleted file mode 100755 index 26f6b61..0000000 --- a/pull-min.sh +++ /dev/null @@ -1,9 +0,0 @@ -#/bin/bash/ - -function pull { - (cd "$1" && echo "[$1]" && docker-compose pull); -} - -pull proxy; -pull telegraf; -pull portainer;