refs #7295 Update base docker image to bookworm and godex ppds #12

Merged
guillermo merged 5 commits from 7295-upgrade-cups-version-and-drivers into master 2024-06-05 05:42:16 +00:00
4 changed files with 10 additions and 34 deletions

View File

@ -1,4 +1,4 @@
FROM debian:bullseye-slim FROM debian:bookworm-slim
ENV TZ Europe/Madrid ENV TZ Europe/Madrid
@ -8,19 +8,18 @@ RUN apt-get update \
curl \ curl \
ca-certificates \ ca-certificates \
sudo \ sudo \
libcupsimage2 libcupsimage2 \
nodejs \
RUN curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash - \ npm \
&& apt install -y nodejs \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Cups # Cups
RUN useradd admin && usermod -g lpadmin admin RUN useradd admin && usermod -g lpadmin admin
COPY ctzcls-cups_1.1.0-0_amd64.deb /tmp/ COPY ctzcls-cups_1.1.0-2_amd64.deb /tmp/
RUN chmod a+x /tmp/ctzcls-cups_1.1.0-0_amd64.deb \ RUN chmod a+x /tmp/ctzcls-cups_1.1.0-2_amd64.deb \
&& dpkg -i /tmp/ctzcls-cups_1.1.0-0_amd64.deb && dpkg -i /tmp/ctzcls-cups_1.1.0-2_amd64.deb
# Printnatura # Printnatura
@ -42,4 +41,4 @@ COPY \
COPY sql sql COPY sql sql
ENTRYPOINT ["/printnatura/entrypoint.sh"] ENTRYPOINT ["/printnatura/entrypoint.sh"]
CMD ["node", "main.js"] CMD ["node", "main.js"]

Binary file not shown.

Binary file not shown.

View File

@ -1,30 +1,7 @@
version: '3.7' version: '3.8'
services: services:
main: main:
image: registry.verdnatura.es/printnatura:${VERSION:?} image: registry.verdnatura.es/printnatura:${VERSION:?}
build: build:
context: . context: .
dockerfile: Dockerfile 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