From a870d3a166441e5acbda57497144231e4dba02c0 Mon Sep 17 00:00:00 2001 From: Brett Date: Wed, 13 Nov 2024 15:26:25 +0100 Subject: [PATCH] last commit --- README.md | 3 +++ ckan/Dockerfile | 2 +- ckan/Dockerfile.dev | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0720c59..09c50b5 100644 --- a/README.md +++ b/README.md @@ -135,6 +135,9 @@ Written: /srv/app/src_extensions/ckanext-mytheme The new extension files and directories are created in the `/srv/app/src_extensions/` folder in the running container. They will also exist in the local src/ directory as local `/src` directory is mounted as `/srv/app/src_extensions/` on the ckan container. +Please note that you will need to change the stat command to `stat -f '%u' src` on Mac OS rather than `stat -c '%u' src` which is specific to GNU stat (ie: Linux) + + #### Running HTTPS on development mode Sometimes is useful to run your local development instance under HTTPS, for instance if you are using authentication extensions like [ckanext-saml2auth](https://github.com/keitaroinc/ckanext-saml2auth). To enable it, set the following in your `.env` file: diff --git a/ckan/Dockerfile b/ckan/Dockerfile index 4f1032b..17269f0 100644 --- a/ckan/Dockerfile +++ b/ckan/Dockerfile @@ -1,4 +1,4 @@ -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 diff --git a/ckan/Dockerfile.dev b/ckan/Dockerfile.dev index d5419ba..b4a12b9 100644 --- a/ckan/Dockerfile.dev +++ b/ckan/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM ckan/ckan-dev:2.11.0-py3.10 +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 @@ -41,6 +41,8 @@ COPY --chown=ckan-sys:ckan-sys docker-entrypoint.d/* /docker-entrypoint.d/ # runtime mounted ones) COPY --chown=ckan-sys:ckan-sys patches ${APP_DIR}/patches +USER ckan + RUN for d in $APP_DIR/patches/*; do \ if [ -d $d ]; then \ for f in `ls $d/*.patch | sort -g`; do \