From e34af8177e63c7fd30caf1edcec25452ac88e6ba Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
Date: Tue, 21 Jul 2020 16:17:47 -0400
Subject: [PATCH] Switch keystone image builds

Change-Id: I7a0276fc7dcfa4536ddfae5ff19151d2d5e24608
---
 images/keystone/Dockerfile       | 20 ++++----------------
 images/keystone/constraints.txt  |  2 ++
 images/keystone/requirements.txt |  4 ++++
 3 files changed, 10 insertions(+), 16 deletions(-)
 create mode 100644 images/keystone/constraints.txt
 create mode 100644 images/keystone/requirements.txt

diff --git a/images/keystone/Dockerfile b/images/keystone/Dockerfile
index 6e0b2163..b89768b3 100644
--- a/images/keystone/Dockerfile
+++ b/images/keystone/Dockerfile
@@ -13,21 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM docker.io/opendevorg/python-builder as builder
-COPY bindep.txt /tmp/src/bindep.txt
-RUN apt update && apt -y install git
-ADD https://releases.openstack.org/constraints/upper/ussuri /tmp/src/upper-constraints.txt
-RUN assemble git+https://opendev.org/openstack/keystone@stable/ussuri \
-             msgpack===0.6.1 \
-             PyMySQL \
-	     python-memcached
+FROM vexxhost/python-builder AS builder
+FROM vexxhost/python-base
 
-FROM docker.io/opendevorg/uwsgi-base
-COPY --from=builder /output/ /output
-RUN apt update && apt -y install git && \
-    /output/install-from-bindep && \
-    apt -y purge git && apt clean all
 EXPOSE 5000
-ENV UWSGI_HTTP_SOCKET=:5000 \
-    UWSGI_WSGI_FILE=/usr/local/bin/keystone-wsgi-public
-CMD ["/usr/local/bin/uwsgi","--ini","/etc/uwsgi/uwsgi.ini"]
+ENV UWSGI_HTTP_SOCKET=:5000 UWSGI_WSGI_FILE=/usr/local/bin/keystone-wsgi-public
+CMD ["/usr/local/bin/uwsgi", "--ini", "/etc/uwsgi/uwsgi.ini"]
diff --git a/images/keystone/constraints.txt b/images/keystone/constraints.txt
new file mode 100644
index 00000000..45f127c5
--- /dev/null
+++ b/images/keystone/constraints.txt
@@ -0,0 +1,2 @@
+git+https://opendev.org/openstack/keystone@stable/ussuri
+--constraint https://releases.openstack.org/constraints/upper/ussuri
diff --git a/images/keystone/requirements.txt b/images/keystone/requirements.txt
new file mode 100644
index 00000000..fefb9efd
--- /dev/null
+++ b/images/keystone/requirements.txt
@@ -0,0 +1,4 @@
+uWSGI
+keystone
+PyMySQL
+python-memcached