Merge pull request #259 from metno/solr_dist-can-make-the-dmci-worker…

…-to-SIGKILL-when-extracting-featureType-from-OPeNDAP-link,-if-thredds-or-lustre-is-not-responsing.-#240

 Update Dockerfile to include .dodsrc file so timeout for OPeNDAP req…

Dockerfile

@@ -78,6 +78,8 @@ RUN apt-get -qqy update && \
     && rm -rf /var/lib/apt/lists/* && \
     pip install "gunicorn${GUNICORN_VERSION}"
 
+RUN pip install --upgrade pip setuptools
+
 COPY --from=builder /dst/. /
 
 # Fix netcdf4 ssl error, occurring when solr-indexer tries to read featureType from the netcdf file
@@ -105,6 +107,6 @@ ENV METRICS_PORT 9200
 EXPOSE 9200
 
 COPY container/gunicorn_prometheus_config.py /src/
-
+COPY container/.dodsrc /root/.dodsrc
 # Start application
 CMD gunicorn -c /src/gunicorn_prometheus_config.py --worker-class sync --workers 5 --bind 0.0.0.0:8000 wsgi:app --keep-alive 5 --log-level info

container/.dodsrc

@@ -0,0 +1 @@
+HTTP.TIMEOUT=20

container/config.yaml

@@ -1,19 +1,19 @@
----
-dmci:
+dmci: 
   distributors:
     - file
     - pycsw
-  distributor_cache: /workdir
+  distributor_cache: workdir
+  rejected_jobs_path: rejected
   max_permitted_size: 100000
   mmd_xsl_path: /usr/share/mmd/xslt/mmd-to-geonorge.xsl
   mmd_xsd_path: /usr/share/mmd/xsd/mmd_strict.xsd
-
+  path_to_parent_list: parent-uuid-list.xml
 pycsw:
   csw_service_url: http://localhost
 
 customization:
   catalog_url: http://localhost
-  env_string: dev
-
+    env_string: dev
+  
 file:
-  file_archive_path: /workdir
+  file_archive_path: archive