Upgrade -> bookworm

.ademe.gitlab-ci.yml

@@ -4,7 +4,7 @@ variables:
   REGISTRY_URL: "$CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME"
   HTTPD_IMAGE: "$CI_REGISTRY/$CI_PROJECT_NAMESPACE/httpd:2.4"
   STACK: getpdf
-  OS_IMAGE: "debian"
+  OS_IMAGE: "bookworm"
 
 stages:
 - build

.gitlab-ci.yml

@@ -4,7 +4,7 @@ variables:
   REGISTRY_URL: "$CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME"
   HTTPD_IMAGE: "$CI_REGISTRY/$CI_PROJECT_NAMESPACE/httpd:2.4"
   STACK: getpdf
-  OS_IMAGE: "debian"
+  OS_IMAGE: "bookworm"
 
 stages:
 - build

Dockerfile.centos

-ARG HTTPD_IMAGE
-FROM ${HTTPD_IMAGE}
-
-
-LABEL Vendor="Actilis" \
-      Maintainer="Francois MICAUX <dok-images@actilis.net>" \
-      Version=20.11 \
-      License=GPLv3
-
-RUN yum -y --setopt=tsflags=nodocs install \
-              libXrender libXext  fontconfig libfontenc libXfont urw-fonts xz \
-              https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox-0.12.6-1.centos7.x86_64.rpm \
-              ca-certificates \
- && yum clean all && rm -rf /var/cache/yum 
-
-
-USER root
-COPY files/ep-getpdf.sh                  /ep.d/99-getpdf.sh
-COPY site /var/www/html
-RUN  chgrp -R ${WEB_USERNAME:-wwww-data} /var/www/html \
-  && chown -R ${WEB_USERNAME:-wwww-data} /var/www/html/logs /var/www/html/docs \
-  && rm -f /var/www/html/index.* /tmp/*
-
-VOLUME /var/www/html/docs
-VOLUME /var/www/html/logs
-
-# Réglages spécifiques à cette appli
-ENV HTTPD_ENABLE_CGI=true
-ENV WEB_APP_INDEX geturl.exe
-HEALTHCHECK --interval=10s --timeout=3s --retries=3 CMD curl -s --fail http://localhost/healthcheck.exe | grep -q ^OK

Dockerfile.debian

@@ -4,12 +4,12 @@ FROM ${HTTPD_IMAGE}
 
 LABEL Vendor="Actilis" \
       Maintainer="Francois MICAUX <dok-images@actilis.net>" \
-      Version=22.07 \
+      Version=25.03 \
       License=GPLv3
 
 RUN set -eux \
  && apt-get update && apt -y install wget uuid-runtime \
- && wget -O /tmp/wkhtmltox.deb  https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.bullseye_amd64.deb \
+ && wget -O /tmp/wkhtmltox.deb  https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.bookworm_amd64.deb \
  && apt-get -y install /tmp/wkhtmltox.deb \
  && rm -f /tmp/wkhtmltox.deb \
  && rm -rf /var/lib/apt/lists/*

README.md

@@ -50,7 +50,7 @@ version: '2.4'
 
 services:
   web:
-    image: registry.actilis.net/docker-images/getpdf:centos-latest
+    image: registry.actilis.net/docker-images/getpdf:bookworm-latest
     restart: on-failure
     hostname: getpdf.local
     ports:

docker-compose.yml → compose.yml

-version: '2.4'
-
 services:
   web:
-    image: registry.actilis.net/docker-images/getpdf:centos-latest
+    image: registry.actilis.net/docker-images/getpdf:dev
+    build:
+      context: .
+      dockerfile: Dockerfile.debian
+      args:
+        HTTPD_IMAGE: "registry.actilis.net/docker-images/httpd:2.4-bookworm"
     restart: on-failure
     hostname: getpdf.local
     ports: