diff --git a/CHANGELOG.md b/CHANGELOG.md index e91a4e577..2d0630487 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) ([#665](https://github.com/cyverse/atmosphere/pull/665)) - Increased default renewal Allocation Units to 336 ([#703](https://github.com/cyverse/atmosphere/pull/703)) + - Upgrade Chromogenic to 0.5.0 and update Dockerfile to be compatible + ([#704](https://github.com/cyverse/atmosphere/pull/704)) ### Removed - Removed dead code ([#689](https://github.com/cyverse/atmosphere/pull/689)) diff --git a/Dockerfile b/Dockerfile index ffdea83ed..d2b767a66 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,18 @@ # Docker Container for Atmosphere -FROM ubuntu:14.04 +FROM ubuntu:18.04 # Set environment SHELL ["/bin/bash", "-c"] # Install dependencies with apt RUN apt-get update && \ - apt-get install --no-install-recommends -y \ + DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ apt-transport-https \ build-essential \ git \ g++ \ libffi-dev \ + libguestfs-tools \ libldap2-dev \ libpq-dev \ libsasl2-dev \ @@ -19,6 +20,7 @@ RUN apt-get update && \ libxml2-dev \ libxslt1-dev \ make \ + netcat \ openssl \ python \ python-dev \ diff --git a/dev_requirements.txt b/dev_requirements.txt index 9e2e3ce3a..4f742dde1 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile -o dev_requirements.txt dev_requirements.in requirements.txt +# pip-compile --output-file=dev_requirements.txt dev_requirements.in requirements.txt # amqp==2.2.2 ansible==2.6.1 @@ -27,7 +27,7 @@ celery==4.0.2 certifi==2017.7.27.1 cffi==1.10.0 chardet==3.0.4 -chromogenic==0.4.20 +chromogenic==0.5.1 cliff==2.8.0 cmd2==0.7.5 colorama==0.3.9 @@ -203,3 +203,6 @@ wheel==0.29.0 wrapt==1.10.10 xlsxwriter==0.9.8 yapf==0.24.0 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools==41.0.1 # via ansible, django-sslserver, ipdb, ipython diff --git a/docker/celerybeat.initd b/docker/celerybeat.initd index 50ab30a9c..d9f168626 100644 --- a/docker/celerybeat.initd +++ b/docker/celerybeat.initd @@ -1,7 +1,4 @@ #!/bin/bash -# -# Templated by Clank -# # ========================================================= # celerybeat - the Celery periodic task scheduler. diff --git a/docker/celeryd.initd b/docker/celeryd.initd index 74c49609c..b7bac3875 100644 --- a/docker/celeryd.initd +++ b/docker/celeryd.initd @@ -1,7 +1,4 @@ #!/bin/bash -# -# Templated by Clank -# # ============================================ # atmosphere celeryd - Starts the Celery worker daemon. diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 1ae92d8b8..bc6e240db 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -65,6 +65,7 @@ else fi # Start services +sed -i "s/^bind 127.0.0.1 ::1$/bind 127.0.0.1/" /etc/redis/redis.conf service redis-server start service celerybeat start service celeryd start diff --git a/docker/flower.initd b/docker/flower.initd index 1b6a2bea9..973c6873a 100644 --- a/docker/flower.initd +++ b/docker/flower.initd @@ -1,7 +1,4 @@ #!/bin/bash -# -# Templated by Clank -# # ========================================================= # flower - the Celery task monitoring web service. diff --git a/docker/test.sh b/docker/test.sh index d384f80ca..6f36aef56 100644 --- a/docker/test.sh +++ b/docker/test.sh @@ -11,6 +11,7 @@ source /opt/env/atmosphere/bin/activate apt-get update && apt-get install -y postgresql pip install -U pip==9.0.3 setuptools pip install pip-tools==1.11.0 +sed -i "s/^bind 127.0.0.1 ::1$/bind 127.0.0.1/" /etc/redis/redis.conf service redis-server start # Wait for DB to be active diff --git a/requirements.txt b/requirements.txt index 924ab2ee2..4eeaa6087 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile -o requirements.txt requirements.in +# pip-compile --output-file=requirements.txt requirements.in # amqp==2.2.2 # via kombu ansible==2.6.1 @@ -21,7 +21,7 @@ celery==4.0.2 certifi==2017.7.27.1 # via requests, tornado cffi==1.10.0 # via bcrypt, cryptography, pynacl chardet==3.0.4 # via requests -chromogenic==0.4.20 +chromogenic==0.5.1 cliff==2.8.0 # via osc-lib, python-heatclient, python-neutronclient, python-openstackclient cmd2==0.7.5 # via cliff colorama==0.3.9 @@ -136,3 +136,6 @@ vine==1.1.4 # via amqp warlock==1.2.0 # via python-glanceclient wrapt==1.10.10 # via debtcollector, positional xlsxwriter==0.9.8 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools==41.0.1 # via ansible, django-sslserver