From 0cc85bc6b4d36a426d32bfa9f1b7937f76e5bd37 Mon Sep 17 00:00:00 2001
From: Hubert depesz Lubaczewski <depesz@depesz.com>
Date: Thu, 6 Mar 2025 12:52:33 +0100
Subject: [PATCH] Update to newer OS and Pg.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is in response for report from Daniel Sauvé
https://gitlab.com/depesz/explain.depesz.com/-/issues/30

While their report didn't report issues with Pg, it's really time to
move off pg11.
---
 docker/Dockerfile         | 15 +++++++--------
 docker/docker-compose.yml |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index c6a861c..dd94e90 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:buster
+FROM debian:bookworm
 
 WORKDIR /explain
 
@@ -19,20 +19,19 @@ RUN apt-get update && \
                 libnumber-bytes-human-perl \
                 pgformatter \
                 curl \
-                build-essential
+                build-essential \
+                cpanminus
 
-RUN curl -L cpanmin.us | perl - -n Mojolicious
-
-RUN cpan install Pg::Explain
+RUN cpanm Pg::Explain
 
 WORKDIR /tmp
 RUN curl https://gitlab.com/depesz/pg-sql-prettyprinter/-/archive/main/pg-sql-prettyprinter-main.tar.bz2 -o pg-sql-prettyprinter-main.tar.bz2 && \
     tar xjvf pg-sql-prettyprinter-main.tar.bz2 && \
     cd pg-sql-prettyprinter-main && \
     perl Build.PL && \
-	./Build && \
-	./Build test && \
-	./Build install
+    ./Build && \
+    ./Build test && \
+    ./Build install
 WORKDIR /explain
 
 COPY docker/explain.json explain.pl ./
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 45ec96a..9154e3e 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -17,7 +17,7 @@ services:
       - ../ext:/explain/ext
       - ../templates:/explain/templates
   db:
-    image: "postgres:11.4"
+    image: "postgres:17-bookworm"
     environment:
       POSTGRES_USER: depesz_explain
       POSTGRES_PASSWORD: depesz_explain