Update fairdatapoint extension

ckan/Dockerfile

@@ -6,7 +6,7 @@
 
 FROM ckan/ckan-base:2.10.4
 
-RUN  pip3 install -e git+https://github.com/GenomicDataInfrastructure/[email protected].3#egg=ckanext-gdi-userportal && \
+RUN  pip3 install -e git+https://github.com/GenomicDataInfrastructure/[email protected].4#egg=ckanext-gdi-userportal && \
     pip3 install -r ${APP_DIR}/src/ckanext-gdi-userportal/requirements.txt
 
 RUN  pip3 install -e git+https://github.com/ckan/[email protected]#egg=ckanext-dcat && \
@@ -15,15 +15,12 @@ RUN  pip3 install -e git+https://github.com/ckan/[email protected]#egg=cka
 RUN pip3 install -e git+https://github.com/ckan/[email protected]#egg=ckanext-harvest && \
     pip3 install -r ${APP_DIR}/src/ckanext-harvest/requirements.txt
 
-RUN git clone https://github.com/CivityNL/ckanext-scheming.git ${APP_DIR}/src/ckanext-scheming && \
-    cd "${APP_DIR}/src/ckanext-scheming" && \
-    git checkout release-3.0.0-civity && \
-    pip3 install -e .
+RUN pip3 install -e git+https://github.com/CivityNL/[email protected]#egg=ckanext-scheming[requirements]
 
 RUN  pip3 install -e git+https://github.com/DataShades/[email protected]#egg=ckanext-oidc-pkce && \
     pip3 install -r ${APP_DIR}/src/ckanext-oidc-pkce/requirements.txt
 
-RUN  pip3 install -e git+https://github.com/GenomicDataInfrastructure/[email protected].2#egg=ckanext-fairdatapoint && \
+RUN  pip3 install -e git+https://github.com/GenomicDataInfrastructure/[email protected].3#egg=ckanext-fairdatapoint && \
     pip3 install -r ${APP_DIR}/src/ckanext-fairdatapoint/requirements.txt
 
 # Install Supervisor and cron

ckan/Dockerfile.dev

@@ -12,18 +12,14 @@ RUN  pip3 install -e git+https://github.com/ckan/[email protected]#egg=cka
 RUN pip3 install -e git+https://github.com/ckan/[email protected]#egg=ckanext-harvest && \
     pip3 install -r ${APP_DIR}/src/ckanext-harvest/requirements.txt
 
-RUN git clone https://github.com/CivityNL/ckanext-scheming.git ${APP_DIR}/src/ckanext-scheming && \
-    cd "${APP_DIR}/src/ckanext-scheming" && \
-    git checkout release-3.0.0-civity && \
-    pip3 install -e .
+RUN pip3 install -e git+https://github.com/CivityNL/[email protected]#egg=ckanext-scheming[requirements]    
 
 RUN  pip3 install -e git+https://github.com/DataShades/[email protected]#egg=ckanext-oidc-pkce && \
     pip3 install -r ${APP_DIR}/src/ckanext-oidc-pkce/requirements.txt
 
-RUN  pip3 install -e git+https://github.com/GenomicDataInfrastructure/[email protected].2#egg=ckanext-fairdatapoint && \
+RUN  pip3 install -e git+https://github.com/GenomicDataInfrastructure/[email protected].3#egg=ckanext-fairdatapoint && \
     pip3 install -r ${APP_DIR}/src/ckanext-fairdatapoint/requirements.txt
 
-
 # Install Supervisor and cron
 RUN apk update \
     && apk add --no-cache supervisor cronie \
@@ -63,3 +59,6 @@ RUN for d in $APP_DIR/patches/*; do \
 ENV CKAN__PLUGINS="envvars image_view text_view recline_view scheming_datasets scheming_organizations gdi_userportal dcat harvest ckan_harvester dcat_rdf_harvester dcat_json_harvester dcat_json_interface oidc_pkce fairdatapointharvester activity"
 
 COPY  --chown=ckan:ckan setup/prerun.py ${APP_DIR}
+
+RUN mkdir -p /var/lib/ckan/storage/uploads/group && \
+    chmod -R u+rwx "/var/lib/ckan"

docker-compose.yml

@@ -3,8 +3,6 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-only
 
-version: "3"
-
 volumes:
   ckan_storage:
   pg_data: