From f133886a25257ac07e5eb6e380315ff4b08812ac Mon Sep 17 00:00:00 2001 From: Ayman Izzeldin Date: Mon, 29 Jan 2024 12:16:34 +0000 Subject: [PATCH] remove old falkor plugin (#94) --- contrib/docker-ckan/dev-deploy/Dockerfile | 5 ----- contrib/docker-ckan/dev.env.template | 2 +- contrib/docker-ckan/prod.env.template | 2 +- contrib/docker-ckan/prod/Dockerfile | 4 ---- 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/contrib/docker-ckan/dev-deploy/Dockerfile b/contrib/docker-ckan/dev-deploy/Dockerfile index 881fbc03d..46ce31a0d 100644 --- a/contrib/docker-ckan/dev-deploy/Dockerfile +++ b/contrib/docker-ckan/dev-deploy/Dockerfile @@ -53,11 +53,6 @@ RUN pip3 install -e 'git+https://github.com/SmdhMdep/ckanext-usertracking.git@m RUN pip3 install -e 'git+https://github.com/SmdhMdep/ckanext-smdh.git@main#egg=ckanext-smdh' && \ pip3 install -r ${APP_DIR}/src/ckanext-smdh/requirements.txt -## FALKOR ### -RUN pip3 install -e 'git+https://github.com/SmdhMdep/ckanext-falkor.git@main#egg=ckanext-falkor' && \ - pip3 install -r ${APP_DIR}/src/ckanext-falkor/requirements.txt && \ - pip3 install -r ${APP_DIR}/src/ckanext-falkor/dev-requirements.txt - ## TAGLIST ### RUN pip3 install -e 'git+https://github.com/SmdhMdep/ckanext-taglist.git@main#egg=ckanext-taglist' && \ pip3 install -r ${APP_DIR}/src/ckanext-taglist/requirements.txt && \ diff --git a/contrib/docker-ckan/dev.env.template b/contrib/docker-ckan/dev.env.template index 8edf822a1..dd1a7c43f 100644 --- a/contrib/docker-ckan/dev.env.template +++ b/contrib/docker-ckan/dev.env.template @@ -76,7 +76,7 @@ NGINX_SSLPORT=443 # Extensions # Keep the datasetformchain plugin at the end as it depends on the order to function correctly -CKAN__PLUGINS="envvars datasci_sharing image_view text_view recline_view pdf_view cloudstorage datastore datapusher sso saml2auth falkor smdh smdh_dataset_form smdh_group_form taglist usertracking granularvisibility generalpublic privatedatasets datasetformchain" +CKAN__PLUGINS="envvars datasci_sharing image_view text_view recline_view pdf_view cloudstorage datastore datapusher sso saml2auth smdh smdh_dataset_form smdh_group_form taglist usertracking granularvisibility generalpublic privatedatasets datasetformchain" CKAN__HARVEST__MQ__TYPE=redis CKAN__HARVEST__MQ__HOSTNAME=redis CKAN__HARVEST__MQ__PORT=6379 diff --git a/contrib/docker-ckan/prod.env.template b/contrib/docker-ckan/prod.env.template index f90c18e58..373ef7542 100644 --- a/contrib/docker-ckan/prod.env.template +++ b/contrib/docker-ckan/prod.env.template @@ -83,7 +83,7 @@ NGINX_SSLPORT=443 # Extensions # Keep the datasetformchain plugin at the end as it depends on the order to function correctly -CKAN__PLUGINS="envvars datasci_sharing image_view text_view datatables_view pdf_view cloudstorage datastore datapusher sso saml2auth falkor smdh smdh_dataset_form smdh_group_form usertracking taglist granularvisibility generalpublic privatedatasets datasetformchain" +CKAN__PLUGINS="envvars datasci_sharing image_view text_view datatables_view pdf_view cloudstorage datastore datapusher sso saml2auth smdh smdh_dataset_form smdh_group_form usertracking taglist granularvisibility generalpublic privatedatasets datasetformchain" CKAN__HARVEST__MQ__TYPE=redis CKAN__HARVEST__MQ__HOSTNAME=redis CKAN__HARVEST__MQ__PORT=6379 diff --git a/contrib/docker-ckan/prod/Dockerfile b/contrib/docker-ckan/prod/Dockerfile index 377221689..816df384a 100644 --- a/contrib/docker-ckan/prod/Dockerfile +++ b/contrib/docker-ckan/prod/Dockerfile @@ -30,10 +30,6 @@ RUN pip3 install -e 'git+https://github.com/SmdhMdep/ckanext-usertracking.git@m RUN pip3 install -e 'git+https://github.com/SmdhMdep/ckanext-smdh.git@main#egg=ckanext-smdh' && \ pip3 install -r ${APP_DIR}/src/ckanext-smdh/requirements.txt -## FALKOR ### -RUN pip3 install -e 'git+https://github.com/SmdhMdep/ckanext-falkor.git@main#egg=ckanext-falkor' && \ - pip3 install -r ${APP_DIR}/src/ckanext-falkor/requirements.txt - ## TAGLIST ### RUN pip3 install -e 'git+https://github.com/SmdhMdep/ckanext-taglist.git@main#egg=ckanext-taglist' && \ pip3 install -r ${APP_DIR}/src/ckanext-taglist/requirements.txt