From 7303552fda84e8de7d594e03b3790945f9025301 Mon Sep 17 00:00:00 2001
From: Anthony Lin <anthony.jclin@gmail.com>
Date: Sat, 26 Aug 2017 01:49:41 +0000
Subject: [PATCH] Update Shipyard Dockerfile

Update dockerfile to install SQLAlchemy and allow
connectivity to postgresql DB.  Added requirements
for PasteDeploy and KeystoneMiddleWare.

1) Update Shipyard Dockerfile
2) Move packages for pip install from Dockerfile to
   requirements.txt so as to consolidate requirements
   into 1 single file
3) Align with the version used in DryDock for uwsgi,
   PasteDeploy and keystonemiddleware

Change-Id: I92b794dd7fdbd54c3652ae546a06e86f1593c456
---
 Dockerfile            | 10 +++++-----
 requirements.txt      |  9 ++++++++-
 test-requirements.txt |  1 -
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7c4b6f3d..d13ce6e8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,13 +35,9 @@ RUN set -x && \
     make \
     libffi-dev \
     libssl-dev \
+    libpq-dev \
     --no-install-recommends \
     && python3 -m pip install -U pip \
-    && pip3 install falcon \
-    && pip3 install requests \
-    && pip3 install uwsgi \
-    && pip3 install configparser \
-    && pip3 install python-openstackclient==3.11.0 \
     && apt-get clean \
     && rm -rf \
         /var/lib/apt/lists/* \
@@ -51,6 +47,10 @@ RUN set -x && \
         /usr/share/doc \
         /usr/share/doc-base
 
+# Copy dependency requirements
+COPY ./requirements.txt /tmp/
+RUN pip3 install -r /tmp/requirements.txt
+
 # Create shipyard user
 RUN useradd -ms /bin/bash shipyard
 
diff --git a/requirements.txt b/requirements.txt
index 60cf1f8e..1657a362 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,10 @@
 falcon==1.2.0
 python-dateutil==2.6.1
-requests==2.18.3
\ No newline at end of file
+requests==2.18.4
+uwsgi===2.0.15
+configparser==3.5.0
+python-openstackclient==3.11.0
+SQLAlchemy==1.1.13
+psycopg2==2.7.3.1
+PasteDeploy==1.5.2
+keystonemiddleware===4.9.1
diff --git a/test-requirements.txt b/test-requirements.txt
index 891fe4f7..29d61759 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,7 +3,6 @@ pytest==3.2.1
 mock==2.0.0
 testfixtures==5.1.1
 apache-airflow[crypto,celery,postgres,hive,hdfs,jdbc]==1.8.1
-psycopg2==2.7.3
 
 # Linting
 flake8==3.3.0