ckan-docker update 11/2024

.env.example

@@ -43,6 +43,7 @@ CKAN_SMTP_STARTTLS=True
 CKAN_SMTP_USER=user
 CKAN_SMTP_PASSWORD=pass
 CKAN_SMTP_MAIL_FROM=ckan@localhost
+CKAN_MAX_UPLOAD_SIZE_MB=100
 TZ=UTC
 
 # Solr
@@ -56,11 +57,9 @@ CKAN_REDIS_URL=redis://redis:6379/1
 TEST_CKAN_REDIS_URL=redis://redis:6379/1
 
 # Datapusher
-DATAPUSHER_VERSION=0.0.20
+DATAPUSHER_VERSION=0.0.21
 CKAN_DATAPUSHER_URL=http://datapusher:8800
 CKAN__DATAPUSHER__CALLBACK_URL_BASE=http://ckan:5000
-DATAPUSHER_REWRITE_RESOURCES=True
-DATAPUSHER_REWRITE_URL=http://ckan:5000
 
 # NGINX
 NGINX_PORT=80

bin/ckan

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -e
+ROOT="$(dirname ${BASH_SOURCE[0]})/.."
+
+docker compose -f "${ROOT}/docker-compose.dev.yml" exec ckan-dev ckan "$@"

bin/compose

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -e
+ROOT="$(dirname ${BASH_SOURCE[0]})/.."
+
+docker compose -f "${ROOT}/docker-compose.dev.yml" "$@"

bin/generate_extension

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -e
+ROOT="$(dirname ${BASH_SOURCE[0]})/.."
+if [[ "$(uname)" == "Darwin" ]]; then
+  # macOS
+	USERGROUP="$(stat -f '%u:%g' "${ROOT}/src")"
+else
+	USERGROUP="$(stat -c '%u:%g' "${ROOT}/src")"
+fi
+
+docker compose -f "${ROOT}/docker-compose.dev.yml" exec -u "$USERGROUP" \
+	-e HOME=/srv/app/src_extensions ckan-dev ckan generate extension \
+	--output-dir /srv/app/src_extensions

bin/install_src

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -e
+ROOT="$(dirname ${BASH_SOURCE[0]})/.."
+
+docker compose -f "${ROOT}/docker-compose.dev.yml" run -u root ckan-dev ./install_src.sh

bin/reload

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -e
+ROOT="$(dirname ${BASH_SOURCE[0]})/.."
+
+docker compose -f "${ROOT}/docker-compose.dev.yml" exec ckan-dev \
+	bash -c 'kill $(ls -l /proc/*/exe | grep bin/python | grep -Po '"'"'/proc/\K[^/]*'"'"')'

bin/restart

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -e
+ROOT="$(dirname ${BASH_SOURCE[0]})/.."
+
+docker compose -f "${ROOT}/docker-compose.dev.yml" restart ckan-dev

bin/shell

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -e
+ROOT="$(dirname ${BASH_SOURCE[0]})/.."
+
+docker compose -f "${ROOT}/docker-compose.dev.yml" exec ckan-dev bash "$@"

ckan/Dockerfile

@@ -1,14 +1,16 @@
-FROM ckan/ckan-base:2.11.0
+FROM ckan/ckan-base:2.11
 
 # Install any extensions needed by your CKAN instance
 # See Dockerfile.dev for more details and examples
 
 # Copy custom initialization scripts
-COPY docker-entrypoint.d/* /docker-entrypoint.d/
+COPY --chown=ckan-sys:ckan-sys docker-entrypoint.d/* /docker-entrypoint.d/
 
 # Apply any patches needed to CKAN core or any of the built extensions (not the
 # runtime mounted ones)
-COPY patches ${APP_DIR}/patches
+COPY --chown=ckan-sys:ckan-sys patches ${APP_DIR}/patches
+
+USER ckan
 
 RUN for d in $APP_DIR/patches/*; do \
         if [ -d $d ]; then \

ckan/Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM ckan/ckan-dev:2.11.0
+FROM ckan/ckan-dev:2.11
 
 # Install any extensions needed by your CKAN instance
 # - Make sure to add the plugins to CKAN__PLUGINS in the .env file
@@ -35,11 +35,13 @@ FROM ckan/ckan-dev:2.11.0
 # to get them mounted in this image at runtime
 
 # Copy custom initialization scripts
-COPY docker-entrypoint.d/* /docker-entrypoint.d/
+COPY --chown=ckan-sys:ckan-sys docker-entrypoint.d/* /docker-entrypoint.d/
 
 # Apply any patches needed to CKAN core or any of the built extensions (not the
 # runtime mounted ones)
-COPY patches ${APP_DIR}/patches
+COPY --chown=ckan-sys:ckan-sys patches ${APP_DIR}/patches
+
+USER ckan
 
 RUN for d in $APP_DIR/patches/*; do \
         if [ -d $d ]; then \

docker-compose.dev.yml

@@ -4,7 +4,8 @@ volumes:
   solr_data:
   pip_cache:
   site_packages:
-  vscode_server:
+  local_bin:
+  home_dir:
 
 services:
 
@@ -26,17 +27,24 @@ services:
       - ckan_storage:/var/lib/ckan
       - ./src:/srv/app/src_extensions
       - pip_cache:/root/.cache/pip
-      - site_packages:/usr/lib/python3.10/site-packages
-      - vscode_server:/root/.vscode-server
+      - site_packages:/usr/local/lib/python3.10/site-packages
+      - local_bin:/usr/local/bin
+      - home_dir:/srv/app/
     restart: unless-stopped
     healthcheck:
       test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:5000"]
+      interval: 60s
+      timeout: 10s
+      retries: 3
 
   datapusher:
     image: ckan/ckan-base-datapusher:${DATAPUSHER_VERSION}
     restart: unless-stopped
     healthcheck:
       test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:8800"]
+      interval: 60s
+      timeout: 10s
+      retries: 3
 
   db:
     build:

docker-compose.yml

@@ -46,7 +46,10 @@ services:
       - site_packages:/usr/lib/python3.10/site-packages
     restart: unless-stopped
     healthcheck:
-      test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:5000"]
+      test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:5000/api/action/status_show"]
+      interval: 60s
+      timeout: 10s
+      retries: 3
 
   datapusher:
     networks:
@@ -56,6 +59,9 @@ services:
     restart: unless-stopped
     healthcheck:
       test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:8800"]
+      interval: 60s
+      timeout: 10s
+      retries: 3
 
   db:
     build:

nginx/Dockerfile

@@ -8,6 +8,7 @@ RUN apk update --no-cache && \
 
 COPY setup/nginx.conf ${NGINX_DIR}/nginx.conf
 COPY setup/index.html /usr/share/nginx/html/index.html
+COPY setup/error.html /usr/share/nginx/html/error.html
 COPY setup/default.conf ${NGINX_DIR}/conf.d/
 
 RUN mkdir -p ${NGINX_DIR}/certs
@@ -20,4 +21,4 @@ ENTRYPOINT \
     -keyout ${NGINX_DIR}/certs/ckan-local.key \
     -out ${NGINX_DIR}/certs/ckan-local.crt \
     -days 365 && \
-  nginx -g 'daemon off;'
+  nginx -g 'daemon off;'

nginx/setup/error.html

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Error</title>
+</head>
+<body>
+    <h1>Oops! Something went wrong.</h1>
+    <p>We're sorry, but the page you requested could not be found.</p>
+</body>
+</html>

nginx/setup/nginx.conf

@@ -38,10 +38,12 @@ http {
 
     # Enable gzip encryption
     gzip  on;
-    
+
     proxy_cache_path /tmp/nginx_cache levels=1:2 keys_zone=cache:30m max_size=250m;
     proxy_temp_path /tmp/nginx_proxy 1 2;
 
+    client_max_body_size 140M;
+
     include /etc/nginx/conf.d/*.conf;
 
     # Error status text

postgresql/Dockerfile

@@ -1,4 +1,4 @@
-FROM postgres:12-alpine
+FROM postgres:16-alpine
 
 # Include extra setup scripts (eg datastore)
 COPY --chown=postgres:postgres docker-entrypoint-initdb.d /docker-entrypoint-initdb.d