From 003a0a56fe3800ba2e44f0ee7c21c064c7576c21 Mon Sep 17 00:00:00 2001 From: Peter Heiner Date: Thu, 11 Apr 2019 11:03:21 +0100 Subject: [PATCH 1/3] HOTFIX: fix typo --- mws/apimws/management/commands/ansible_inventory.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mws/apimws/management/commands/ansible_inventory.py b/mws/apimws/management/commands/ansible_inventory.py index 4d005367..7a988711 100644 --- a/mws/apimws/management/commands/ansible_inventory.py +++ b/mws/apimws/management/commands/ansible_inventory.py @@ -126,9 +126,9 @@ def vhost_vars(vh): # Dict of lists of hostnames that certain certificate providers can support, keyed by provider vhv['cert_domains'] = { # ACME (Let's Encrypt) can only certify hostnames it can resolve - 'acme': vh.domains(subset=vh.GLOBAL_NAMES) + 'acme': vh.domains(subset=vh.GLOBAL_NAMES), # QuoVadis will certify tentative and private hostnames as well - 'qv': vh.domains(subset=vh.PRIVATE_AND_GLOBAL_NAMES) + 'qv': vh.domains(subset=vh.PRIVATE_AND_GLOBAL_NAMES), } # The main domain where all the domain names associated will redirect to if vh.main_domain: From dc44bb7df63424caccaee4c4192ce51184302c1d Mon Sep 17 00:00:00 2001 From: Peter Heiner Date: Tue, 16 Apr 2019 16:38:09 +0100 Subject: [PATCH 2/3] add psycopg2 build-time requirements --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 983b8186..d5bf4ac1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,10 +2,11 @@ FROM debian:stretch # Install additional Debian packages RUN apt-get -y update && apt-get upgrade -y && apt-get install -y \ - vim python python-pip \ + vim python python-pip python-dev\ openssl userv openssh-client \ apache2 apache2-utils libapache2-mod-wsgi \ - libssl-dev libjpeg-dev netcat zlib1g-dev + libssl-dev libjpeg-dev netcat zlib1g-dev \ + libpq-dev build-essential # Update pip and install Python dependencies. Note that vmmanager is installed # from a local copy of the source. We use pip install -e to install vmmanager so From a106d00e9b62003d85833b25dff2393442234d31 Mon Sep 17 00:00:00 2001 From: Peter Heiner Date: Wed, 17 Apr 2019 07:10:01 +0100 Subject: [PATCH 3/3] remove build dependencies and apt cache --- Dockerfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d5bf4ac1..c1ff3076 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,11 +11,15 @@ RUN apt-get -y update && apt-get upgrade -y && apt-get install -y \ # Update pip and install Python dependencies. Note that vmmanager is installed # from a local copy of the source. We use pip install -e to install vmmanager so # that, if a local developer mounts the vmmanager sources as a volume, changes -# in the sources are reflected within the container. +# in the sources are reflected within the container. We clean up the apt cache +# and build dependencies afterwards COPY mws/requirements.txt ./ COPY vmmanager /usr/src/vmmanager RUN pip install /usr/src/vmmanager && \ - pip install --upgrade -r requirements.txt + pip install --upgrade -r requirements.txt && \ + apt-get -y purge python-dev libssl-dev libjpeg-dev \ + zlib1g-dev libpq-dev build-essential && \ + apt-get -y autoremove && apt-get -y clean # Provide wait-for-it within the container COPY docker/wait-for-it.sh ./