Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update & Fix extensions #56

Merged
merged 2 commits into from
Jul 20, 2023
Merged

Update & Fix extensions #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d3bb36
Update & Fix extensions
mjanez Jul 20, 2023
75ae76c
Remove ckanext-sparql_interface
mjanez Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ CKAN_SITE_ID=default
CKAN_SITE_URL=http://localhost
CKAN__ROOT_PATH=/catalog/{{LANG}}
CKAN_PORT=5000
CKAN__FAVICON=/catalog/base/images/ckan.ico
CKAN___BEAKER__SESSION__SECRET=CHANGE_ME
# See https://docs.ckan.org/en/latest/maintaining/configuration.html#api-token-settings
CKAN___API_TOKEN__JWT__ENCODE__SECRET=string:CHANGE_ME
Expand Down Expand Up @@ -149,9 +150,5 @@ CKANEXT__GEOVIEW__OL_VIEWER__FORMATS="wms wfs geojson gml kml"
CKANEXT__GEOVIEW__SHP_VIEWER__SRID=3857
CKANEXT__GEOVIEW__SHP_VIEWER__ENCODING=UTF-8

# ckanext-sparql_interface
CKANEXT__SPARQL__ENDPOINT_URL=http://dbpedia.org/sparql
CKANEXT__SPARQL__HIDE_ENDPOINT_URL=False

# ckanext-facet_scheming
CKANEXT__FACET_FACET_LIST="theme theme_es dcat_type groups publisher_name publisher_type spatial_uri owner_org res_format frequency tags tag_uri conforms_to "
22 changes: 11 additions & 11 deletions ckan/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,26 @@ FROM ghcr.io/mjanez/ckan-base-spatial:ckan-2.9.9
ENV APP_DIR=/srv/app \
TZ=UTC

# requirements.txt files fixed until next releases
COPY req_fixes ${APP_DIR}/req_fixes

# Extensions
### XLoader - v0.12.2 ###
### XLoader - 1.0.1 ###
### Harvester - v1.5.1 ###
### Geoview - v0.0.20 ###
### Spatial - v2.0.0 ###
### Spatial - v2.0.0 ### fixed requirements.txt
### DCAT - 1.0.0-geodcatap (GeoDCAT-AP extended version) ###
### Scheming - 1.1.0-geodcatap (GeoDCAT-AP extended version) ###
### Resource dictionary - 1.0.1 ###
### Pages - v0.5.1 ###
### PDFView - v0.0.8 ###
### Pages - v0.5.2 ###
### PDFView - 0.0.8 ###
### Facet Scheming - 1.0.1 ###
### SPARQL Interface - 2.0.1 ###
RUN echo ${TZ} > /etc/timezone && \
if ! [ /usr/share/zoneinfo/${TZ} -ef /etc/localtime ]; then cp /usr/share/zoneinfo/${TZ} /etc/localtime ; fi && \
# Install CKAN extensions
echo "ckan/ckanext-xloader" && \
pip3 install -e 'git+https://github.com/ckan/ckanext-xloader.git@0.12.2#egg=ckanext-xloader' && \
pip3 install -e 'git+https://github.com/ckan/ckanext-xloader.git@1.0.1#egg=ckanext-xloader' && \
pip3 install -r ${APP_DIR}/src/ckanext-xloader/requirements.txt && \
pip3 install -U requests[security] && \
echo "ckan/ckanext-harvest" && \
Expand All @@ -30,7 +33,7 @@ RUN echo ${TZ} > /etc/timezone && \
pip3 install -e 'git+https://github.com/ckan/ckanext-geoview.git@v0.0.20#egg=ckanext-geoview' && \
echo "ckan/ckanext-spatial" && \
pip3 install -e 'git+https://github.com/ckan/ckanext-spatial.git@v2.0.0#egg=ckanext-spatial' && \
pip3 install -r https://raw.githubusercontent.com/ckan/ckanext-spatial/bae9290395b252ee8e40056256fa694569d1d78b/requirements.txt && \
pip3 install -r ${APP_DIR}/req_fixes/ckanext-spatial_requirements.txt && \
echo "mjanez/ckanext-dcat (GeoDCAT-AP extended version)" && \
pip3 install -e git+https://github.com/mjanez/ckanext-dcat.git@1.0.0-geodcatap#egg=ckanext-dcat && \
pip3 install -r https://raw.githubusercontent.com/mjanez/ckanext-dcat/master/requirements.txt && \
Expand All @@ -39,15 +42,12 @@ RUN echo ${TZ} > /etc/timezone && \
echo "mjanez/ckanext-resourcedictionary" && \
pip3 install -e 'git+https://github.com/mjanez/ckanext-resourcedictionary.git@1.0.1#egg=ckanext-resourcedictionary' && \
echo "ckan/ckanext-pages" && \
pip3 install -e git+https://github.com/ckan/ckanext-pages.git@v0.5.1#egg=ckanext-pages && \
pip3 install -e git+https://github.com/ckan/ckanext-pages.git@v0.5.2#egg=ckanext-pages && \
echo "ckan/ckanext-pdfview" && \
pip3 install -e git+https://github.com/ckan/ckanext-pdfview.git@0.0.8#egg=ckanext-pdfview && \
echo "OpenDataGIS/ckanext-facet_scheming" && \
pip3 install -e git+https://github.com/OpenDataGIS/ckanext-facet_scheming.git@1.0.1#egg=ckanext_facet_scheming && \
pip3 install -r https://raw.githubusercontent.com/OpenDataGIS/ckanext-facet_scheming/1.0.1/requirements.txt && \
echo "OpenDataGIS/ckanext-sparql_interface" && \
pip3 install -e git+https://github.com/OpenDataGIS/ckanext-sparql_interface.git@2.0.1#egg=ckanext-sparql_interface && \
pip3 install -r https://raw.githubusercontent.com/OpenDataGIS/ckanext-sparql_interface/2.0.1/requirements.txt
pip3 install -r https://raw.githubusercontent.com/OpenDataGIS/ckanext-facet_scheming/1.0.1/requirements.txt

# Used to configure the container environment by setting environment variables, creating users, running initialization scripts, .etc
COPY docker-entrypoint.d/* /docker-entrypoint.d/
Expand Down
14 changes: 14 additions & 0 deletions ckan/req_fixes/ckanext-spatial_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
ckantoolkit
lxml>=2.3
argparse
pyparsing>=2.1.10
requests>=1.1.0
six

# requirements pyproj tempfix: https://github.com/pyproj4/pyproj/issues/1321
pyproj==2.6.1; python_version < '3.9'
pyproj @ git+https://github.com/pyproj4/pyproj.git@main; python_version >= '3.9'

Shapely==2.0.1
OWSLib==0.28.1
geojson==3.0.1
Loading