From 0f235e7d03107dc8eb6c1c6ee18d0a92b7e4220f Mon Sep 17 00:00:00 2001 From: Hans-Chrstian Date: Wed, 14 Aug 2024 17:50:39 +0200 Subject: [PATCH] Update references --- ckan/Dockerfile | 9 +++------ ckan/Dockerfile.dev | 11 +++++------ docker-compose.yml | 2 -- src/ckanext-gdi-userportal | 2 +- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/ckan/Dockerfile b/ckan/Dockerfile index 643841bf..afc00295 100644 --- a/ckan/Dockerfile +++ b/ckan/Dockerfile @@ -6,7 +6,7 @@ FROM ckan/ckan-base:2.10.4 -RUN pip3 install -e git+https://github.com/GenomicDataInfrastructure/gdi-userportal-ckanext-gdi-userportal.git@v1.2.3#egg=ckanext-gdi-userportal && \ +RUN pip3 install -e git+https://github.com/GenomicDataInfrastructure/gdi-userportal-ckanext-gdi-userportal.git@v1.2.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/ckanext-dcat.git@v1.5.1#egg=ckanext-dcat && \ @@ -15,15 +15,12 @@ RUN pip3 install -e git+https://github.com/ckan/ckanext-dcat.git@v1.5.1#egg=cka RUN pip3 install -e git+https://github.com/ckan/ckanext-harvest.git@v1.5.6#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/ckanext-scheming.git@release-3.0.0-civity#egg=ckanext-scheming[requirements] RUN pip3 install -e git+https://github.com/DataShades/ckanext-oidc-pkce.git@v0.3.1#egg=ckanext-oidc-pkce && \ pip3 install -r ${APP_DIR}/src/ckanext-oidc-pkce/requirements.txt -RUN pip3 install -e git+https://github.com/GenomicDataInfrastructure/gdi-userportal-ckanext-fairdatapoint.git@v1.2.2#egg=ckanext-fairdatapoint && \ +RUN pip3 install -e git+https://github.com/GenomicDataInfrastructure/gdi-userportal-ckanext-fairdatapoint.git@v1.2.3#egg=ckanext-fairdatapoint && \ pip3 install -r ${APP_DIR}/src/ckanext-fairdatapoint/requirements.txt # Install Supervisor and cron diff --git a/ckan/Dockerfile.dev b/ckan/Dockerfile.dev index 2c483ca3..65c8fd4f 100644 --- a/ckan/Dockerfile.dev +++ b/ckan/Dockerfile.dev @@ -12,18 +12,14 @@ RUN pip3 install -e git+https://github.com/ckan/ckanext-dcat.git@v1.5.1#egg=cka RUN pip3 install -e git+https://github.com/ckan/ckanext-harvest.git@v1.5.6#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/ckanext-scheming.git@release-3.0.0-civity#egg=ckanext-scheming[requirements] RUN pip3 install -e git+https://github.com/DataShades/ckanext-oidc-pkce.git@v0.3.1#egg=ckanext-oidc-pkce && \ pip3 install -r ${APP_DIR}/src/ckanext-oidc-pkce/requirements.txt -RUN pip3 install -e git+https://github.com/GenomicDataInfrastructure/gdi-userportal-ckanext-fairdatapoint.git@v1.2.2#egg=ckanext-fairdatapoint && \ +RUN pip3 install -e git+https://github.com/GenomicDataInfrastructure/gdi-userportal-ckanext-fairdatapoint.git@v1.2.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" diff --git a/docker-compose.yml b/docker-compose.yml index 0a473097..bc9299b4 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,8 +3,6 @@ # # SPDX-License-Identifier: AGPL-3.0-only -version: "3" - volumes: ckan_storage: pg_data: diff --git a/src/ckanext-gdi-userportal b/src/ckanext-gdi-userportal index 761da45c..8ae0670f 160000 --- a/src/ckanext-gdi-userportal +++ b/src/ckanext-gdi-userportal @@ -1 +1 @@ -Subproject commit 761da45cdbe7e7095fc7d5dc7a1dac7a5fa696c2 +Subproject commit 8ae0670f04fa254e6b4f81b521ffda744058d150