From e153528fccda6b152573fe467c974663c0625bd6 Mon Sep 17 00:00:00 2001
From: shawn-higgins1 <23224097+shawn-higgins1@users.noreply.github.com>
Date: Fri, 28 Jun 2019 16:40:19 -0400
Subject: [PATCH] GRN2-162: Revert to sqlite in docker compose (#594)

* Revert to sqlite

* Missed uncomenting sqlite volume

* Update sample.env
---
 docker-compose.yml | 32 ++++++++++++++++----------------
 sample.env         | 15 +++++++--------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index a3aac4cac1..0907708776 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,7 @@ services:
     env_file: .env
     restart: unless-stopped
     ports:
-      - 5000:80
+      - 127.0.0.1:5000:80
 # When using external logging
 #    logging:
 #      driver: $LOG_DRIVER
@@ -18,19 +18,19 @@ services:
     volumes:
       - ./log:/usr/src/app/log
 # When using sqlite3 as the database
-#      - ./db/production:/usr/src/app/db/production
+      - ./db/production:/usr/src/app/db/production
 # When using postgresql as the database
-    links:
-      - db
-  db:
-    image: postgres:9.5
-    restart: on-failure
-    ports:
-      - 5432:5432
-    volumes:
-      - ./db/production:/var/lib/postgresql/data
-    environment:
-      - PGHOST=postgres
-      - PGDATABASE=postgres
-      - PGUSER=postgres
-      - PGPASSWORD=password
+#    links:
+#      - db
+#  db:
+#    image: postgres:9.5
+#    restart: on-failure
+#    ports:
+#      - 127.0.0.1:5432:5432
+#    volumes:
+#      - ./db/production:/var/lib/postgresql/data
+#    environment:
+#      - PGHOST=postgres
+#      - PGDATABASE=postgres
+#      - PGUSER=postgres
+#      - PGPASSWORD=password
diff --git a/sample.env b/sample.env
index ff094c8b5e..74ba1d00f5 100644
--- a/sample.env
+++ b/sample.env
@@ -188,11 +188,10 @@ ENABLE_GOOGLE_CALENDAR_BUTTON=
 # DB_USERNAME=postgres
 # DB_PASSWORD=password
 #
-# Note that the example provided, works for deployments based on the docker-compose script wich is also included. 
-# But should you need to use an external Postgres server, the right values for HOST, USERNAME and PASSWORD should be applied.
-#
-DB_ADAPTER=postgresql
-DB_HOST=db
-DB_NAME=greenlight_production
-DB_USERNAME=postgres
-DB_PASSWORD=password
+# For deployments based on the docker-compose script also included, the HOST should be set with the Docker container id.
+#
+# DB_ADAPTER=postgresql
+# DB_HOST=db
+# DB_NAME=greenlight_production
+# DB_USERNAME=postgres
+# DB_PASSWORD=password