Merge pull request #96 from ckan/init-improvements

Init stage improvements

ckan/Dockerfile

@@ -1,11 +1,19 @@
 FROM ckan/ckan-base:2.10.1
 
-# Set up environment variables
+# Install any extensions needed by your CKAN instance
-ENV APP_DIR=/srv/app
+# See Dockerfile.dev for more details and examples
-ENV TZ=UTC
-RUN echo ${TZ} > /etc/timezone
 
-# Make sure both files are not exactly the same
+# Copy custom initialization scripts
-RUN if ! [ /usr/share/zoneinfo/${TZ} -ef /etc/localtime ]; then \
+COPY docker-entrypoint.d/* /docker-entrypoint.d/
-        cp /usr/share/zoneinfo/${TZ} /etc/localtime ;\
+
-    fi ;
+# Apply any patches needed to CKAN core or any of the built extensions (not the
+# runtime mounted ones)
+COPY patches ${APP_DIR}/patches
+
+RUN for d in $APP_DIR/patches/*; do \
+        if [ -d $d ]; then \
+            for f in `ls $d/*.patch | sort -g`; do \
+                cd $SRC_DIR/`basename "$d"` && echo "$0: Applying patch $f to $SRC_DIR/`basename $d`"; patch -p1 < "$f" ; \
+            done ; \
+        fi ; \
+    done

ckan/Dockerfile.dev

@@ -1,23 +1,13 @@
 FROM ckan/ckan-dev:2.10.1
 
-
-# Set up environment variables
-ENV APP_DIR=/srv/app
-ENV TZ=UTC
-RUN echo ${TZ} > /etc/timezone
-
-# Make sure both files are not exactly the same
-RUN if ! [ /usr/share/zoneinfo/${TZ} -ef /etc/localtime ]; then \
-        cp /usr/share/zoneinfo/${TZ} /etc/localtime ;\
-    fi ;
-
 # 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)
+# - Also make sure all provide all extra configuration options, either by:
-#   This can be done by creating an overriding start_ckan_dev_development.sh file:
+#   * Adding them to the .env file (check the ckanext-envvars syntax for env vars), or
-#   (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
+#   * Adding extra configuration scripts to /docker-entrypoint.d folder) to update
-#   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
+#      the CKAN config file (ckan.ini) with the `ckan config-tool` command
-#   or using Crudini (https://github.com/pixelb/crudini) 
+#
+# See README > Extending the base images for more details
 #
 # For instance:
 #
@@ -44,9 +34,11 @@ RUN if ! [ /usr/share/zoneinfo/${TZ} -ef /etc/localtime ]; then \
 # Clone the extension(s) your are writing for your own project in the `src` folder
 # to get them mounted in this image at runtime
 
+# Copy custom initialization scripts
+COPY 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
 
 RUN for d in $APP_DIR/patches/*; do \

ckan/docker-entrypoint.d/README.md

@@ -0,0 +1,4 @@
+Use scripts in this folder to run extra initialization steps in your custom CKAN images.
+Any file with `.sh` or `.py` extension will be executed just after the main initialization
+script (`prerun.py`) is executed and just before the web server and supervisor processes are
+started.