diff --git a/print/Dockerfile b/print/Dockerfile deleted file mode 100644 index 1ea1351..0000000 --- a/print/Dockerfile +++ /dev/null @@ -1,40 +0,0 @@ -ARG MAINTAINER -FROM debian:bullseye -MAINTAINER $MAINTAINER - -# Install Packages (basic tools, cups, basic drivers, HP drivers) -RUN apt-get update \ -&& apt-get install -y \ - sudo \ - whois \ - usbutils \ - cups \ - cups-client \ - cups-bsd \ - cups-filters \ - foomatic-db-compressed-ppds \ - printer-driver-all \ - openprinting-ppds \ - hpijs-ppds \ - hp-ppd \ - hplip \ - smbclient \ - printer-driver-cups-pdf \ -&& apt-get clean \ -&& rm -rf /var/lib/apt/lists/* - -# Add user and disable sudo password checking -RUN useradd \ - --groups=sudo,lp,lpadmin \ - --create-home \ - --home-dir=/home/print \ - --shell=/bin/bash \ - --password=$(mkpasswd print) \ - print \ -&& sed -i '/%sudo[[:space:]]/ s/ALL[[:space:]]*$/NOPASSWD:ALL/' /etc/sudoers - -# Copy the default configuration file -COPY --chown=root:lp cupsd.conf /etc/cups/cupsd.conf - -# Default shell -CMD ["/usr/sbin/cupsd", "-f"] diff --git a/print/cupsd.conf b/print/cupsd.conf deleted file mode 100644 index a482ccb..0000000 --- a/print/cupsd.conf +++ /dev/null @@ -1,135 +0,0 @@ -LogLevel warn -PageLogFormat -MaxLogSize 0 -ErrorPolicy retry-job -# Allow remote access -Port 631 -Listen /run/cups/cups.sock -# Share local printers on the local network. -Browsing On -BrowseLocalProtocols dnssd -DefaultAuthType Basic -WebInterface Yes -DefaultEncryption IfRequested - - # Allow shared printing and remote administration... - Order allow,deny - Allow all - - - # Allow remote administration... - Order allow,deny - Allow all - - - AuthType Default - Require user @SYSTEM - # Allow remote access to the configuration files... - Order allow,deny - Allow all - - - AuthType Default - Require user @SYSTEM - # Allow remote access to the log files... - Order allow,deny - Allow all - - - JobPrivateAccess default - JobPrivateValues default - SubscriptionPrivateAccess default - SubscriptionPrivateValues default - - Order deny,allow - - - Require user @OWNER @SYSTEM - Order deny,allow - - - AuthType Default - Require user @SYSTEM - Order deny,allow - - - AuthType Default - Require user @SYSTEM - Order deny,allow - - - Require user @OWNER @SYSTEM - Order deny,allow - - - Order deny,allow - - - - JobPrivateAccess default - JobPrivateValues default - SubscriptionPrivateAccess default - SubscriptionPrivateValues default - - AuthType Default - Order deny,allow - - - AuthType Default - Require user @OWNER @SYSTEM - Order deny,allow - - - AuthType Default - Require user @SYSTEM - Order deny,allow - - - AuthType Default - Require user @SYSTEM - Order deny,allow - - - AuthType Default - Require user @OWNER @SYSTEM - Order deny,allow - - - Order deny,allow - - - - JobPrivateAccess default - JobPrivateValues default - SubscriptionPrivateAccess default - SubscriptionPrivateValues default - - AuthType Negotiate - Order deny,allow - - - AuthType Negotiate - Require user @OWNER @SYSTEM - Order deny,allow - - - AuthType Default - Require user @SYSTEM - Order deny,allow - - - AuthType Default - Require user @SYSTEM - Order deny,allow - - - AuthType Negotiate - Require user @OWNER @SYSTEM - Order deny,allow - - - Order deny,allow - - - -ServerAlias * diff --git a/print/docker-compose.yaml b/print/docker-compose.yaml deleted file mode 100644 index bd1f2e0..0000000 --- a/print/docker-compose.yaml +++ /dev/null @@ -1,29 +0,0 @@ -version: "3.3" - -services: - - cups: - image: olbat/cupsd - volumes: - - /var/run/dbus:/var/run/dbus - - ${VOLUMES_PATH}/cups:/etc/cups - devices: - - /dev/usblp0 - privileged: true - network_mode: host -# networks: -# - web -# ports: -# - 631:631 - labels: - - "traefik.enable=true" - - "traefik.http.routers.cups.rule=Host(`print.${DOMAIN}`)" - - "traefik.http.routers.cups.entrypoints=web" - - "traefik.http.services.cups.loadbalancer.server.port=631" - - "docker.group=print" - restart: unless-stopped - -networks: - web: - external: true - diff --git a/proxy/docker-compose.yaml b/proxy/docker-compose.yaml index 5ca4c28..f8ff06d 100644 --- a/proxy/docker-compose.yaml +++ b/proxy/docker-compose.yaml @@ -10,8 +10,8 @@ services: - "443:443" networks: - web - - dockersocket volumes: + - "/var/run/docker.sock:/var/run/docker.sock:ro" - "$PWD/traefik.yml:/etc/traefik/traefik.yml" - "$PWD/extraProviders/:/extraProviders:ro" labels: @@ -22,8 +22,6 @@ services: - "docker.group=proxy" extra_hosts: - host.docker.internal:172.17.0.1 - depends_on: - - docker-socket-proxy docker-socket-proxy: diff --git a/proxy/traefik.yml b/proxy/traefik.yml index 587f802..3c1ff30 100644 --- a/proxy/traefik.yml +++ b/proxy/traefik.yml @@ -10,7 +10,7 @@ api: providers: docker: exposedbydefault: false - endpoint: "tcp://docker-socket-proxy:2375" + endpoint: "unix:///var/run/docker.sock" file: directory: /extraProviders diff --git a/start-all.sh b/start-all.sh index 9a8cd65..e43afa9 100755 --- a/start-all.sh +++ b/start-all.sh @@ -13,4 +13,4 @@ up dashboard; up download; up portainer; up torrent; -up print; +