prepare for docx/pptx export

Author: pvgenuchten

docker/docker-compose.sqlite.yml

@@ -1,7 +1,6 @@
 services:
 
   traefik:
-    restart: always 
     image: "traefik:v3.1"
     container_name: "traefik"
     command:
@@ -17,7 +16,6 @@ services:
 
 
   mapserver:
-    restart: always 
     image: "camptocamp/mapserver:8.4"
     container_name: "mapserver"
     expose:
@@ -40,13 +38,12 @@ services:
       - "traefik.http.routers.mapserver.entrypoints=web"
 
   pycsw:
-    restart: always 
-    image: "ghcr.io/geopython/pycsw"
+    image: "geopython/pycsw@sha256:2eb396798e40dfab3ad4cb839f30231b8c1023db148ed03ffcf3c4e6b388fc7c"
     container_name: "pycsw"
     volumes:
       - ./pycsw/pycsw.yml:/etc/pycsw/pycsw.yml
-      - ./pycsw/templates/_base.html:/usr/local/lib/python3.10/site-packages/pycsw/ogc/api/templates/_base.html 
-      - ./pycsw/templates/landing_page.html:/usr/local/lib/python3.10/site-packages/pycsw/ogc/api/templates/landing_page.html
+      - ./pycsw/templates/_base.html:/home/pycsw/pycsw/pycsw/templates/_base.html # to override layout
+      - ./pycsw/templates/landing_page.html:/home/pycsw/pycsw/pycsw/templates/landing_page.html # to override layout
       - ./data:/srv/data
     environment:
       # Configuration for the catalogue, see the pycsw.yml file how these values are used

docker/docker-compose.yml

@@ -1,8 +1,7 @@
 services:
 
   traefik:
-    restart: always 
-    image: "traefik:v3.1"
+    image: "traefik:v3.4.3"
     container_name: "traefik"
     command:
       - "--log.level=DEBUG"
@@ -17,7 +16,6 @@ services:
 
 
   mapserver:
-    restart: always 
     image: "camptocamp/mapserver:8.4"
     container_name: "mapserver"
     expose:
@@ -36,6 +34,7 @@ services:
       - "traefik.http.middlewares.mapserver-strip-prefix.stripprefix.prefixes=/ows,/ows/"
       - "traefik.http.routers.mapserver.middlewares=mapserver-strip-prefix@docker"
       - "traefik.http.routers.mapserver.entrypoints=web"
+      - "traefik.http.services.mapserver.loadbalancer.server.port=80"
 
   pycsw:
     restart: always 
@@ -63,9 +62,9 @@ services:
       - "traefik.enable=true"
       - "traefik.http.routers.pycsw.rule=Host(`${SDI_DOMAIN}`)"
       - "traefik.http.routers.pycsw.entrypoints=web"
+      - "traefik.http.services.pycsw.loadbalancer.server.port=8000"
 
   terria:
-    restart: always 
     image: "ghcr.io/terriajs/terriamap:0.4.2"
     container_name: "terria"
     volumes:
@@ -78,10 +77,9 @@ services:
       - "traefik.http.middlewares.terria-strip-prefix.stripprefix.prefixes=/map,/map/"
       - "traefik.http.routers.terria.middlewares=terria-strip-prefix@docker"
       - "traefik.http.routers.terria.entrypoints=web"
-
+      - "traefik.http.services.terria.loadbalancer.server.port=3001"
 
   postgres:
-    restart: always 
     image: postgis/postgis:15-3.4-alpine
     container_name: "postgres"
     environment:

docs/3-catalogue-publication.md

@@ -32,8 +32,7 @@ pycsw is available as Docker image at the [github container registry](https://do
 Pull and run the pycsw container locally using this command in a command line client (cmd, PowerShell, bash):
 
 ```bash
-docker pull ghcr.io/geopython/pycsw
-docker run -p 8000:8000 ghcr.io/geopython/pycsw
+docker run -p 8000:8000 geopython/pycsw
 ```
 
 Open your browser and browse to <http://localhost:8000> to see pycsw in action.
@@ -94,6 +93,7 @@ pycsw-admin.py delete-records -c /etc/pycsw/pycsw.yml
 ```
 
 ### Docker
+
 ```bash
 docker exec -it pycsw bash -c "pycsw-admin.py delete-records -c /etc/pycsw/pycsw.yml"
 ```
@@ -109,13 +109,12 @@ Use pycsw-admin.py to load the records into the catalogue database:
 
 ### Container terminal
 ```bash
-pycsw-admin.py load-records -p /etc/data/export -c /etc/pycsw/pycsw.yml -y -r
+pycsw-admin.py load-records -p /srv/data/export -c /etc/pycsw/pycsw.yml -y -r
 ```
 
 # Docker
 ```bash
-docker exec -it pycsw bash -c `
- "pycsw-admin.py load-records -p /etc/data/export -c /etc/pycsw/pycsw.yml -y -r"
+docker exec -it pycsw bash -c "pycsw-admin.py load-records -p /srv/data/export -c /etc/pycsw/pycsw.yml -y -r"
 ```