Merge pull request 'refs #7295 Update base docker image to bookworm and godex ppds' (!12) from 7295-upgrade-cups-version-and-drivers into master

Reviewed-on: #12

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"]
+CMD ["node", "main.js"]

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