diff --git a/Dockerfile b/Dockerfile index f494ebf..fc61d1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye-slim +FROM debian:bookworm-slim ENV TZ Europe/Madrid @@ -8,19 +8,18 @@ RUN apt-get update \ curl \ ca-certificates \ sudo \ - libcupsimage2 - -RUN curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash - \ - && apt install -y nodejs \ + libcupsimage2 \ + nodejs \ + npm \ && rm -rf /var/lib/apt/lists/* # Cups RUN useradd admin && usermod -g lpadmin admin -COPY ctzcls-cups_1.1.0-0_amd64.deb /tmp/ -RUN chmod a+x /tmp/ctzcls-cups_1.1.0-0_amd64.deb \ - && dpkg -i /tmp/ctzcls-cups_1.1.0-0_amd64.deb +COPY ctzcls-cups_1.1.0-2_amd64.deb /tmp/ +RUN chmod a+x /tmp/ctzcls-cups_1.1.0-2_amd64.deb \ + && dpkg -i /tmp/ctzcls-cups_1.1.0-2_amd64.deb # Printnatura @@ -42,4 +41,4 @@ COPY \ COPY sql sql ENTRYPOINT ["/printnatura/entrypoint.sh"] -CMD ["node", "main.js"] \ No newline at end of file +CMD ["node", "main.js"] diff --git a/ctzcls-cups_1.1.0-0_amd64.deb b/ctzcls-cups_1.1.0-0_amd64.deb deleted file mode 100644 index fd6c68d..0000000 Binary files a/ctzcls-cups_1.1.0-0_amd64.deb and /dev/null differ diff --git a/ctzcls-cups_1.1.0-2_amd64.deb b/ctzcls-cups_1.1.0-2_amd64.deb new file mode 100644 index 0000000..70d726e Binary files /dev/null and b/ctzcls-cups_1.1.0-2_amd64.deb differ diff --git a/docker-compose.yml b/docker-compose.yml index 141e2cd..f5ee11d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,30 +1,7 @@ -version: '3.7' +version: '3.8' services: main: image: registry.verdnatura.es/printnatura:${VERSION:?} build: context: . - dockerfile: Dockerfile - ports: - - 631 - configs: - - source: config - target: /printnatura/config.local.yml - - source: cups - target: /etc/cups/cupsd.conf - volumes: - - /mnt/appdata/cups:/etc/cups - deploy: - placement: - constraints: - - node.role == worker - resources: - limits: - memory: 1G -configs: - config: - external: true - name: printnatura-config - cups: - external: true - name: printnatura-cups + dockerfile: Dockerfile \ No newline at end of file