From 6d0f04202e048dcd970119961255a0e95cabeb1b Mon Sep 17 00:00:00 2001
From: Ian Dees <ian.dees@gmail.com>
Date: Wed, 15 Feb 2017 11:04:19 -0500
Subject: [PATCH 1/2] Adding my attempt at running tests in Docker

---
 Dockerfile.test         | 18 ++++++++++++++++++
 docker-compose.test.yml | 12 ++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 Dockerfile.test
 create mode 100644 docker-compose.test.yml

diff --git a/Dockerfile.test b/Dockerfile.test
new file mode 100644
index 00000000..b98170aa
--- /dev/null
+++ b/Dockerfile.test
@@ -0,0 +1,18 @@
+FROM python:3.4
+
+RUN apt-get update \
+ && apt-get upgrade -y \
+ && apt-get install -y libgdal1-dev gdal-bin
+
+ADD . /machine
+WORKDIR /machine
+
+ENV CPLUS_INCLUDE_PATH=/usr/include/gdal
+ENV C_INCLUDE_PATH=/usr/include/gdal
+
+RUN gdalinfo --version
+
+RUN pip install cairocffi gdal==1.10.0 \
+ && pip install -U .
+
+CMD ["python", "setup.py", "test"]
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
new file mode 100644
index 00000000..25d1a60f
--- /dev/null
+++ b/docker-compose.test.yml
@@ -0,0 +1,12 @@
+machine-test:
+  build: .
+  dockerfile: Dockerfile.test
+  environment:
+    - DATABASE_URL=postgresql://openaddr:openaddr@postgres/openaddr
+  links:
+    - postgres
+postgres:
+  image: mdillon/postgis
+  environment:
+    - POSTGRES_USER=openaddr
+    - POSTGRES_PASSWORD=openaddr

From 82d58f47f077db4027c75faa77c5aac3885c425e Mon Sep 17 00:00:00 2001
From: Ian Dees <ian.dees@gmail.com>
Date: Wed, 15 Feb 2017 22:29:19 -0500
Subject: [PATCH 2/2] A tiny bit of progress on tests

---
 Dockerfile.test          | 20 ++++++++++----------
 docker-compose.test.yml  |  2 ++
 openaddr/ci/schema.pgsql |  4 ----
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/Dockerfile.test b/Dockerfile.test
index b98170aa..c9d3bd80 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -1,18 +1,18 @@
 FROM python:3.4
 
-RUN apt-get update \
- && apt-get upgrade -y \
- && apt-get install -y libgdal1-dev gdal-bin
+RUN apt-get update && \
+    apt-get install -y \
+            libgdal1-dev \
+            gdal-bin && \
+    rm -rf /var/lib/apt/lists/*
 
-ADD . /machine
+COPY . /machine
 WORKDIR /machine
 
 ENV CPLUS_INCLUDE_PATH=/usr/include/gdal
 ENV C_INCLUDE_PATH=/usr/include/gdal
 
-RUN gdalinfo --version
-
-RUN pip install cairocffi gdal==1.10.0 \
- && pip install -U .
-
-CMD ["python", "setup.py", "test"]
+RUN pip install \
+        cairocffi \
+        gdal==1.10.0 && \
+    pip install -U .
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 25d1a60f..2c311f2a 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -1,5 +1,7 @@
 machine-test:
   build: .
+  volumes:
+    - .:/machine
   dockerfile: Dockerfile.test
   environment:
     - DATABASE_URL=postgresql://openaddr:openaddr@postgres/openaddr
diff --git a/openaddr/ci/schema.pgsql b/openaddr/ci/schema.pgsql
index 0ae3a4c6..bce51285 100644
--- a/openaddr/ci/schema.pgsql
+++ b/openaddr/ci/schema.pgsql
@@ -99,8 +99,6 @@ CREATE VIEW dashboard_runs AS
     SELECT round(extract(epoch from datetime_start)::numeric, 3)::text AS tsname
     FROM sets;
 
-GRANT SELECT ON dashboard_runs TO dashboard;
-
 CREATE VIEW dashboard_stats AS
     SELECT round(extract(epoch from s.datetime_start)::numeric, 3)::text AS tsname,
            r.source_path AS source,
@@ -119,5 +117,3 @@ CREATE VIEW dashboard_stats AS
     WHERE r.set_id IS NOT NULL
       AND s.datetime_end IS NOT NULL
       AND r.state::text != 'null';
-
-GRANT SELECT ON dashboard_stats TO dashboard;