From c75168afae4f4f5b4cf18225dc619ff148390c13 Mon Sep 17 00:00:00 2001
From: PJ Dietz <pjdietz@gmail.com>
Date: Fri, 14 Aug 2020 06:57:13 -0400
Subject: [PATCH] Stop tracking .env and set default in docker-compose.yml

---
 .env               | 1 -
 .gitignore         | 6 +++++-
 docker-compose.yml | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
 delete mode 100644 .env

diff --git a/.env b/.env
deleted file mode 100644
index 25241b7..0000000
--- a/.env
+++ /dev/null
@@ -1 +0,0 @@
-PORT=8080
diff --git a/.gitignore b/.gitignore
index a4a4c4c..fe38263 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,4 +22,8 @@ preview
 workspace.xml
 
 # Local scratch files
-notes
\ No newline at end of file
+notes
+
+# Local overrides
+.env
+docker-compose.override.yml
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 453612a..97e3292 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
   nginx:
     image: nginx:1.15
     ports:
-      - ${PORT}:80
+      - ${PORT:-8080}:80
     volumes:
       - .:/usr/local/src/wellrested
       - ./docker/nginx/site.conf:/etc/nginx/conf.d/default.conf