From c0b61dfae61a370b7d4192977b3c6aa216b3e5d4 Mon Sep 17 00:00:00 2001
From: medina5 <emmanuel.medina@univ-lorraine.fr>
Date: Mon, 13 Oct 2025 20:59:17 +0200
Subject: [PATCH] Dockerfile

---
 Caddyfile                                          |  4 ----
 compose.yaml                                       | 11 ++++++-----
 postgraphile/Dockerfile => postgraphile.Dockerfile |  4 ++--
 Dockerfile => postgresql.Dockerfile                |  9 ++++-----
 4 files changed, 12 insertions(+), 16 deletions(-)
 delete mode 100644 Caddyfile
 rename postgraphile/Dockerfile => postgraphile.Dockerfile (84%)
 rename Dockerfile => postgresql.Dockerfile (97%)

diff --git a/Caddyfile b/Caddyfile
deleted file mode 100644
index 7f00cd1..0000000
--- a/Caddyfile
+++ /dev/null
@@ -1,4 +0,0 @@
-*.localhost {
-  reverse_proxy pgadmin:80
-  tls internal
-}
diff --git a/compose.yaml b/compose.yaml
index 17e52cf..3d7b04a 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -12,9 +12,9 @@ services:
     image: lucaslorentz/caddy-docker-proxy:2.10
     restart: "no"
     ports:
-      - 80:80
-      - 443:443/tcp
-      - 443:443/udp
+      - "8000:8000"
+      - "8443:8443/tcp"
+      - "8443:8443/udp"
       - "2019:2019"
     networks:
       - caddy_net
@@ -22,7 +22,8 @@ services:
       CADDY_INGRESS_NETWORKS: ${COMPOSE_PROJECT_NAME}_caddy_net
     volumes:
       - ./data:/usr/share/caddy
-      - /var/run/docker.sock:/var/run/docker.sock:ro
+      #- /var/run/docker.sock:/var/run/docker.sock:ro
+      - /run/user/1000/podman/podman.sock:/var/run/docker.sock:Z
     labels:
       caddy_admin: "on"
 
@@ -289,7 +290,7 @@ services:
         condition: service_healthy
     command: postgrest
     environment:
-      PGRST_DB_URI: postgres://${POSTGREST_USER:-postgrest}:9012@${POSTGREST_HOST:-database}:${POSTGREST_DB_PORT:-5432}/${COMPOSE_PROJECT_NAME}
+      PGRST_DB_URI: postgres://${POSTGREST_USER:-postgrest}:${POSTGREST_PASSWORD}@${POSTGREST_HOST:-database}:${POSTGREST_DB_PORT:-5432}/${COMPOSE_PROJECT_NAME}
       PGRST_DB_SCHEMAS: ${POSTGREST_DB_SCHEMAS:-public}
       PGRST_DB_ANON_ROLE: ${POSTGREST_DB_ANON_ROLE:-role_web}
       PGRST_JWT_SECRET: ${POSTGREST_JWT_SECRET:-ChangeMeChangeMeChangeMeChangeMe}
diff --git a/postgraphile/Dockerfile b/postgraphile.Dockerfile
similarity index 84%
rename from postgraphile/Dockerfile
rename to postgraphile.Dockerfile
index 8334080..2c79885 100644
--- a/postgraphile/Dockerfile
+++ b/postgraphile.Dockerfile
@@ -8,5 +8,5 @@ RUN npm install -g postgraphile &&\
   npm install -g postgraphile-plugin-connection-filter-postgis &&\
   npm install -g postgraphile-plugin-fulltext-filter
 
-EXPOSE 5000
-ENTRYPOINT ["postgraphile", "-n", "0.0.0.0", "--cors"]
+EXPOSE 80
+ENTRYPOINT ["postgraphile", "--host", "0.0.0.0", "--port", "80", "--cors"]
diff --git a/Dockerfile b/postgresql.Dockerfile
similarity index 97%
rename from Dockerfile
rename to postgresql.Dockerfile
index e082739..3013916 100644
--- a/Dockerfile
+++ b/postgresql.Dockerfile
@@ -8,9 +8,9 @@ RUN set -eux; \
   apt-get update; \
   apt-get install -y --no-install-recommends \
   build-essential \
-  cmake \
-  checkinstall \
   ca-certificates \
+  checkinstall \
+  cmake \
   ;
 
 FROM build-essential AS build-pgdev
@@ -119,10 +119,9 @@ RUN set -eux; \
   apt-get update; \
   apt-get install -y --no-install-recommends \
     locales; \
+  apt-get clean; \
   sed -i '/fr_FR.UTF-8/s/^# //' /etc/locale.gen; \
-  locale-gen
-
-RUN localedef -i fr_FR -c -f UTF-8 -A /usr/share/locale/locale.alias fr_FR.UTF-8
+  locale-gen; \
 
 ENV TZ=Europe/Paris
 ENV LANG=fr_FR.UTF-8