diff --git a/Dockerfile b/Dockerfile index 2c03731..9ba5d89 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,8 @@ MAINTAINER Michael J. Stealey ENV DEBIAN_FRONTEND noninteractive ENV PY_SAX_PARSER=hs_core.xmlparser +RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main" > /etc/apt/sources.list + RUN apt-get update && apt-get install -y \ apt-transport-https \ ca-certificates \ @@ -41,13 +43,6 @@ RUN npm install -g phantomjs-prebuilt WORKDIR / -# Install iRODS 4.1.8 packages -RUN curl ftp://ftp.renci.org/pub/irods/releases/4.1.8/ubuntu14/irods-runtime-4.1.8-ubuntu14-x86_64.deb -o irods-runtime.deb \ - && curl ftp://ftp.renci.org/pub/irods/releases/4.1.8/ubuntu14/irods-icommands-4.1.8-ubuntu14-x86_64.deb -o irods-icommands.deb \ - && sudo dpkg -i irods-runtime.deb irods-icommands.deb \ - && sudo apt-get -f install \ - && rm irods-runtime.deb irods-icommands.deb - # Install pip based packages (due to dependencies some packages need to come first) RUN export CPLUS_INCLUDE_PATH=/usr/include/gdal \ && export C_INCLUDE_PATH=/usr/include/gdal \ @@ -68,6 +63,15 @@ RUN ./configure --with-python --with-geos=yes \ && sudo ldconfig WORKDIR / +# Install iRODS v.4.2.0 +RUN wget -qO - https://packages.irods.org/irods-signing-key.asc | sudo apt-key add - \ + && echo "deb [arch=amd64] https://packages.irods.org/apt/ trusty main" | \ + sudo tee /etc/apt/sources.list.d/renci-irods.list \ + && sudo apt-get update && sudo apt-get install -y \ + apt-transport-https \ + irods-runtime \ + irods-icommands + # Install SSH for remote PyCharm debugging RUN mkdir /var/run/sshd RUN sed -i 's/PermitRootLogin without-password/PermitRootLogin yes/' /etc/ssh/sshd_config diff --git a/README.md b/README.md index 090320f..ae732a6 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # hs_docker_base Base image for HydroShare project. -Build information at Docker hub: [mjstealey/hs_docker_base](https://hub.docker.com/r/mjstealey/hs_docker_base/) +Build information at Docker hub: [hydroshare/hs_docker_base](https://hub.docker.com/r/hydroshare/hs_docker_base/) **requires.io** diff --git a/requirements.txt b/requirements.txt index 2e130fd..3ddbb7e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,105 +1,150 @@ amqp==1.4.9 anyjson==0.3.3 arrow==0.7.0 +asn1crypto==0.24.0 astroid==1.4.8 autoflake==0.6.6 autopep8==1.2.2 bagit==1.5.4 -beautifulsoup4==4.4.1 +bcrypt==3.1.4 +beautifulsoup4==4.5.3 billiard==3.3.0.23 -bleach==1.4.3 +bleach==3.0.2 celery==3.1.23 -chardet==2.3.0 +cffi==1.11.5 +chardet==3.0.4 +click==6.7 colorama==0.3.7 +configparser==3.5.0 +coreapi==2.3.3 +coreschema==0.0.4 coverage==4.0.3 +cryptography==2.3 cycler==0.10.0 defusedexpat==0.4 defusedxml==0.4.1 -Django==1.8.14 +Django==1.11.18 django-appconf==1.0.2 -django-autocomplete-light==2.0.9 +django-autocomplete-light==2.3.3 django-braces==1.9.0 -django-compressor==2.0 -django-contrib-comments==1.6.2 -django-cors-headers==1.1.0 -django-crispy-forms==1.6.0 -django-debug-toolbar==1.4 -django-haystack==2.4.1 +django-compressor==2.2 +django-contrib-comments==1.9.0 +django-cors-headers==2.4.0 +django-crispy-forms==1.7.2 +django-debug-toolbar==1.9.1 +django-haystack==2.8.1 django-heartbeat==2.0.2 -django-inplaceedit==1.4.1 -django-jsonfield==0.9.19 -django-modeltranslation==0.11 -django-nose==1.4.3 -django-oauth-toolkit==0.10.0 +django-ipware==2.1.0 +django-jsonfield==1.0.1 +django-modeltranslation==0.12.2 +django-nose==1.4.5 +django-oauth-toolkit==1.1.0 django-robots==2.0 django-security==0.9.3 +django-test-without-migrations==0.6 django-timedeltafield==0.7.10 django-widget-tweaks==1.4.1 -djangorestframework==3.3.3 +djangorestframework==3.8.2 docker-py==1.7.2 dominate==2.3.1 +DoubleMetaphone==0.1 +drf-yasg==1.10.0 ecdsa==0.13 -filebrowser-safe==0.4.3 -flake8==2.5.4 +enum34==1.1.6 +filebrowser-safe==0.5.0 +flake8==3.5.0 +flex==6.13.2 funcsigs==1.0.2 -future==0.15.2 -# GDAL==2.1.3 # Installed from source +functools32==3.2.3.post2 +future==0.16.0 +geographiclib==1.49 geojson==1.3.2 +geopy==1.16.0 gevent==1.1.2 -google.foresite-toolkit==1.3 -grappelli-safe==0.4.2 +google.foresite-toolkit==1.3.3 +grappelli-safe==0.5.1 greenlet==0.4.10 gunicorn==19.6.0 html5lib==0.9999999 +idna==2.7 +inflection==0.3.1 +ipaddress==1.0.22 isodate==0.5.4 +itypes==1.1.0 +Jinja2==2.10 +jsonpointer==1.14 +jsonschema==2.6.0 keepalive==0.5 kombu==3.0.35 lazy-object-proxy==1.2.2 -lxml==3.6.0 +lxml==3.7.3 mapnik==0.1 +Markdown==3.0.1 +MarkupSafe==1.0 matplotlib==1.5.1 -mccabe==0.4.0 -Mezzanine==4.1.0 +mccabe==0.6.1 +Mezzanine==4.3.1 mock==1.3.0 +nameparser==0.5.7 netCDF4==1.2.4 nose==1.3.7 -numpy==1.10.4 -oauthlib==1.0.3 +nose-timer>=0.7.4,<1.0.0 +numpy==1.16.0 +oauthlib==2.1.0 +openapi-codec==1.3.2 OWSLib==0.10.3 pandas==0.18.0 -paramiko==1.16.0 +paramiko==2.4.2 pbr==1.10.0 pep8==1.7.0 Pillow==3.1.1 prettytable==0.7.2 +probableparsing==0.0.1 +probablepeople==0.5.4 psutil==4.0.0 psycopg2==2.6.1 py2-ipaddress==3.4.1 +pyasn1==0.4.4 +pycodestyle==2.3.1 +pycparser==2.18 PyCRS==0.1.3 -pycrypto==2.6.1 pyflakes==1.1.0 pylint==1.5.5 +PyNaCl==1.2.1 pyparsing==2.1.7 pyproj==1.9.5.1 pysolr==3.4.0 pysqlite==2.8.1 +pytest-django>=3.4.7, <4.0.0 +python-crfsuite==0.9.6 python-dateutil==2.5.3 --e git+https://github.com/iPlantCollaborativeOpenSource/python-irodsclient.git@dcd234c166c06bdfc40fa2ef135c2511e0a4e7ac#egg=python_irodsclient +python-irodsclient==0.8.1 pytz==2016.3 +PyYAML==3.13 rcssmin==1.0.6 rdflib==4.0.1 redis==2.10.5 -requests==2.9.1 +requests==2.20.0 requests-oauthlib==0.6.1 +rfc3987==1.3.8 rjsmin==1.0.12 +robot-detection==0.4 +ruamel.ordereddict==0.4.13 +ruamel.yaml==0.15.52 selenium==3.0.2 sh==1.11 Shapely==1.5.13 +simplejson==3.16.0 six==1.10.0 SPARQLWrapper==1.7.6 sqlparse==0.2.0 +strict-rfc3339==0.7 suds-jurko==0.6 +swagger-spec-validator==2.3.1 tzlocal==1.2.2 +timeago==1.0.10 +uritemplate==3.0.0 +validate-email==1.3 virtualenv==15.0.2 websocket-client==0.37.0 wrapt==1.10.8