diff --git a/ckan/Dockerfile b/ckan/Dockerfile index 1afab4a..09940b6 100644 --- a/ckan/Dockerfile +++ b/ckan/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/mjanez/ckan-base-spatial:ckan-2.9.9 +FROM ghcr.io/mjanez/ckan-base-spatial:ckan-2.9.11 LABEL maintainer="mnl.janez@gmail.com" # Set up environment variables @@ -83,4 +83,4 @@ RUN chmod +x ${APP_DIR}/start_ckan.sh COPY setup/workers/* /etc/supervisord.d/ # Start CKAN -CMD ["/bin/sh", "-c", "$APP_DIR/start_ckan.sh"] \ No newline at end of file +CMD ["/bin/sh", "-c", "$APP_DIR/start_ckan.sh"] diff --git a/ckan/Dockerfile.dev b/ckan/Dockerfile.dev index 97bbbf8..21f3a8a 100644 --- a/ckan/Dockerfile.dev +++ b/ckan/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM ghcr.io/mjanez/ckan-base-spatial:ckan-2.9.9-dev +FROM ghcr.io/mjanez/ckan-base-spatial:ckan-2.9.11-dev LABEL maintainer="mnl.janez@gmail.com" # Set up environment variables @@ -16,11 +16,12 @@ RUN echo ${TZ} > /etc/timezone && \ # Install any extensions needed by your CKAN instance # - Make sure to add the plugins to CKAN__PLUGINS in the .env file -# - Also make sure all extra configuration options are added to the CKAN config file (ckan.ini) -# This can be done by creating an overriding start_ckan_dev_development.sh file: -# (https://github.com/ckan/ckan-docker-base/blob/main/ckan-2.9/dev/setup/start_ckan_development.sh) ie: updating the 'ckan config-tool' lines -# For more on config-tool please see https://docs.ckan.org/en/latest/maintaining/cli.html#config-tool-tool-for-editing-options-in-a-ckan-config-file -# or using Crudini (https://github.com/pixelb/crudini) +# - Also make sure all provide all extra configuration options, either by: +# * Adding them to the .env file (check the ckanext-envvars syntax for env vars), or +# * Adding extra configuration scripts to /docker-entrypoint.d folder) to update +# the CKAN config file (ckan.ini) with the `ckan config-tool` command +# +# See README > Extending the base images for more details # # For instance: # @@ -79,4 +80,4 @@ RUN for d in $APP_DIR/patches/*; do \ fi \ done ; \ fi ; \ - done \ No newline at end of file + done diff --git a/ckan/Dockerfile.ghcr b/ckan/Dockerfile.ghcr index 98430ee..9ee4604 100644 --- a/ckan/Dockerfile.ghcr +++ b/ckan/Dockerfile.ghcr @@ -1,4 +1,4 @@ -FROM ghcr.io/mjanez/ckan-docker:ckan-2.9.9 +FROM ghcr.io/mjanez/ckan-docker:ckan-2.9.11 LABEL maintainer="mnl.janez@gmail.com" # Set up environment variables