From aa24b15ed56cc439810fd6766a52382a747b844b Mon Sep 17 00:00:00 2001
From: Lukas Holecek <hluk@email.cz>
Date: May 13 2019 11:00:02 +0000
Subject: [PATCH 1/2] docker-compose: Fix environment variable value


Signed-off-by: Lukas Holecek <hluk@email.cz>

---

diff --git a/docker/dev.env b/docker/dev.env
index a7cd506..eb34631 100644
--- a/docker/dev.env
+++ b/docker/dev.env
@@ -3,4 +3,4 @@ PATH=/home/dev/.local/bin:/usr/bin
 GREENWAVE_TEST_URL=http://dev:8080/
 WAIVERDB_TEST_URL=http://waiverdb:5004/
 RESULTSDB_TEST_URL=http://resultsdb:5001/
-PYTEST_ADDOPTS="-o cache_dir=/home/dev/.pytest_cache"
+PYTEST_ADDOPTS=-o cache_dir=/home/dev/.pytest_cache

From 9bcc1a4803141f555aa393dde53184df99eb43ef Mon Sep 17 00:00:00 2001
From: Lukas Holecek <hluk@email.cz>
Date: May 13 2019 13:31:37 +0000
Subject: [PATCH 2/2] docker-compose: Set up waiverdb for development


Builds local waiverdb image and enables running tests in docker-compose
environment.

To run tests, it's still needed to install some dependencies manually.

    docker-compose exec waiverdb pip3 install --user -r requirements.txt
    docker-compose exec waiverdb dnf -y install python3-ldap

Signed-off-by: Lukas Holecek <hluk@email.cz>

---

diff --git a/docker-compose.yml b/docker-compose.yml
index 1de27aa..a76c0f9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -49,7 +49,9 @@ services:
     env_file: docker/waiverdb-db.env
 
   waiverdb:
-    image: "quay.io/factory2/waiverdb:latest"
+    build:
+      context: ../waiverdb
+      dockerfile: openshift/containers/waiverdb/Dockerfile
     working_dir: /code
     env_file: docker/waiverdb.env
     command: ["bash", "-c", "/start.sh"]
diff --git a/docker/waiverdb.env b/docker/waiverdb.env
index 1a6bc3b..9b1b228 100644
--- a/docker/waiverdb.env
+++ b/docker/waiverdb.env
@@ -1,2 +1,4 @@
 DATABASE_PASSWORD=waiverdb
 SECRET_KEY=waiverdb
+WAIVERDB_CONFIG=/etc/waiverdb/settings.py
+PYTEST_ADDOPTS=-o cache_dir=/tmp/.pytest_cache
diff --git a/docs/docker-compose.rst b/docs/docker-compose.rst
index 2129a0e..462f31b 100644
--- a/docs/docker-compose.rst
+++ b/docs/docker-compose.rst
@@ -39,6 +39,15 @@ To resolve this, run this command in the project directory:
 
   $ find -name '*.pyc' -delete
 
+To execute tests for WaiverDB you also need to install the development
+dependencies first.
+
+.. code-block:: console
+
+  $ docker-compose exec waiverdb pip3 install --user -r requirements.txt
+  $ docker-compose exec waiverdb dnf -y install python3-ldap
+  $ docker-compose exec waiverdb python3 -m pytest
+
 Rationale
 ---------