Merge pull request #78 from mjanez/ckan-2.9.9

Update master branch

.gitignore

@@ -18,3 +18,4 @@ src/*
 
 # environment
 .env
+.env.*

ckan-pycsw/Dockerfile

@@ -1,9 +1,9 @@
-FROM ghcr.io/mjanez/ckan-pycsw:latest
+# Base image
+FROM ghcr.io/mjanez/ckan-pycsw:main AS base
 
-# Set up environment variables
+# ckan-pycsw envvars
 ENV APP_DIR=/app
 ENV TZ=UTC
-RUN echo ${TZ} > /etc/timezone
 ENV PYCSW_CKAN_SCHEMA=iso19139_inspire
 ENV PYCSW_CONFIG=${APP_DIR}/pycsw.conf
 ENV CKAN_URL=http://localhost:5000/
@@ -13,11 +13,12 @@ ENV DEV_MODE=False
 ENV TIMEOUT=300
 ENV PYCSW_CRON_DAYS_INTERVAL=2
 ENV PYCSW_CRON_HOUR_START=4
+
 WORKDIR ${APP_DIR}
 
-COPY pycsw/conf/pycsw.conf.template pycsw/entrypoint.sh .
+# Update files if needed
+COPY pycsw/conf/pycsw.conf.template docker-entrypoint.d/entrypoint.sh ./
 
-EXPOSE ${PYCSW_PORT}/TCP
+USER $USERNAME
 
-ENTRYPOINT ["/bin/bash", "./entrypoint.sh"]
-CMD ["tail", "-f", "/dev/null"]
+ENTRYPOINT ["/bin/bash", "./entrypoint.sh"]

ckan-pycsw/docker-entrypoint.d/entrypoint.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -xeuo pipefail
+
+#TODO: -Xfrozen_modules=off from: https://bugs.python.org/issue1666807
+/wait-for --timeout "$TIMEOUT" "$CKAN_URL" -- pdm run python3 -Xfrozen_modules=off ckan2pycsw/ckan2pycsw.py
+
+exec "$@"

ckan/Dockerfile

@@ -14,7 +14,7 @@ COPY req_fixes ${APP_DIR}/req_fixes
 ### Spatial - v2.0.0 ### fixed requirements.txt
 ### DCAT - v1.1.0-geodcatap (GeoDCAT-AP extended version) ###
 ### Scheming - release-3.0.0 ###
-### Resource dictionary - 1.0.1 ###
+### Resource dictionary - v1.0.1 ###
 ### Pages - v0.5.2 ###
 ### PDFView - 0.0.8 ###
 ### Scheming DCAT - v1.2.0 (GeoDCAT-AP extended version) ###
@@ -40,7 +40,7 @@ RUN echo ${TZ} > /etc/timezone && \
     echo "ckan/ckanext-scheming" && \
     pip3 install -e git+https://github.com/ckan/[email protected]#egg=ckanext-scheming && \
     echo "mjanez/ckanext-resourcedictionary" && \
-    pip3 install -e git+https://github.com/mjanez/ckanext-resourcedictionary.git@1.0.1#egg=ckanext-resourcedictionary && \
+    pip3 install -e git+https://github.com/mjanez/ckanext-resourcedictionary.git@v1.0.1#egg=ckanext-resourcedictionary && \
     echo "ckan/ckanext-pages" && \
     pip3 install -e git+https://github.com/ckan/[email protected]#egg=ckanext-pages && \
     echo "ckan/ckanext-pdfview" && \