Skip to content

Commit

Permalink
disabled plugins list in production_root_url.ini (.env values work fi…
Browse files Browse the repository at this point in the history
…ne and cause conflicts if they are not disabled)

Updated Dockerfile to lock pyopenssl and cryptography to the highest versions that still support x509 in the manner that the ckan harvester expects
  • Loading branch information
sjbruce authored and fostermh committed Jul 15, 2024
1 parent 8617bdb commit e12f0aa
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 34 deletions.
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ RUN --mount=type=cache,target=/root/.cache/pip apk add --no-cache .build-deps li
linux-headers curl-dev tiff-dev zlib-dev zstd-dev lz4-dev libarchive-dev \
libjpeg-turbo-dev libpng-dev libwebp-dev expat-dev postgresql-dev openjpeg-dev \
# For cryptography
gcc musl-dev python3-dev libffi-dev openssl-dev cargo pkgconfig py3-urllib3 py3-cryptography \
&& pip install cryptography \
gcc musl-dev python3-dev libffi-dev cargo pkgconfig py3-urllib3 \
&& pip install pyopenssl==23.2.0 \
&& pip install cryptography==38.0.4 \
# Build PROJ
&& mkdir proj \
&& apk add --no-cache cmake \
Expand Down
64 changes: 32 additions & 32 deletions contrib/docker/production_root_url.ini
Original file line number Diff line number Diff line change
Expand Up @@ -94,38 +94,38 @@ ckan.group_and_organization_list_max = 1000
# Add ``resource_proxy`` to enable resorce proxying and get around the
# same origin policy
ckan.plugins = envvars
stats
text_view
image_view
recline_view
datastore
datapusher
scheming_datasets
scheming_organizations
scheming_groups
scheming_nerf_index
fluent
harvest
ckan_harvester
csw_harvester
waf_harvester
doc_harvester
ckan_schema_harvester
spatial_metadata
spatial_query
spatial_harvest_metadata_api
cioos_harvest
cioos_theme
ckan_cioos_harvester
dcat
structured_data
resource_proxy
geo_view
geojson_view
wmts_view
ckan_spatial_harvester
datastream_harvester
#geonetwork_harvester
# stats
# text_view
# image_view
# recline_view
# datastore
# datapusher
# scheming_datasets
# scheming_organizations
# scheming_groups
# scheming_nerf_index
# fluent
# harvest
# ckan_harvester
# csw_harvester
# waf_harvester
# doc_harvester
# ckan_schema_harvester
# spatial_metadata
# spatial_query
# spatial_harvest_metadata_api
# cioos_harvest
# cioos_theme
# ckan_cioos_harvester
# dcat
# structured_data
# resource_proxy
# geo_view
# geojson_view
# wmts_view
# ckan_spatial_harvester
# datastream_harvester
# geonetwork_harvester

# module-path:file to schemas being used
scheming.dataset_schemas = ckanext.scheming:cioos_siooc_schema.json
Expand Down

0 comments on commit e12f0aa

Please sign in to comment.