More updates

README.txt

@@ -28,3 +28,9 @@ Go through all the new changes in the current repo and use those for the new rep
 - Check out Florian's docs https://github.com/dbca-wa/ckan/blob/dbca2022/doc/maintaining/installing/install-from-docker-compose.rst
 - Check out Florian's repo https://github.com/dbca-wa/ckan/tree/dbca2022
 - Documentation to be re-done from scratch...anything that could be useful can be mentioned here eg: local storage for ckan.ini
+
+
+ToDo (workarounds to fix)
+
+1. nginx - what caching should I implement?
+2. DataPusher - needed to use a custom requirements.txt (see https://github.com/ckan/datapusher/pull/251)

datapusher/Dockerfile

@@ -34,7 +34,13 @@ RUN apk add --no-cache \
 RUN mkdir ${APP_DIR}/src && cd ${APP_DIR}/src && \
     git clone -b ${GIT_BRANCH} --depth=1 --single-branch ${GIT_URL} && \
     cd datapusher && \
-    python3 setup.py install && \
+    python3 setup.py install
+
+## Need an custom version of requirements.txt  (with an old release of Werkzeug)
+
+COPY setup/requirements.txt ${APP_DIR}/src/
+    
+RUN  cd ${APP_DIR}/src && \ 
      pip3 install --no-cache-dir -r requirements.txt
 
 RUN apk del .build-deps && \

datapusher/setup/requirements.txt

@@ -0,0 +1,7 @@
+argparse
+ckanserviceprovider==1.0.0
+html5lib==1.0.1
+messytables==0.15.2
+certifi
+requests[security]==2.27.1
+Werkzeug~=2.0.2

docker-compose.yml

@@ -14,9 +14,9 @@ services:
     build:
       context: nginx/
       dockerfile: Dockerfile
-    #depends_on:
+    depends_on:
-    #  ckan:
+      ckan:
-    #    condition: service_healthy
+        condition: service_healthy
     ports:
       - "0.0.0.0:81:80"
     

nginx/Dockerfile

@@ -5,4 +5,6 @@ ENV NGINX_DIR=/etc/nginx
 COPY setup/index.html /usr/share/nginx/html/index.html
 COPY setup/*.conf ${NGINX_DIR}/conf.d/
 
+#RUN mkdir -p /tmp/nginx/cache
+
 EXPOSE 81