From f734303a2673b6e53eb52447c909266cbeb47562 Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Mon, 7 Oct 2019 12:20:25 +0000
Subject: [PATCH] Rename the env-file

---
 .devcontainer/{.env => devcontainer.env} | 0
 .devcontainer/docker-compose.yml         | 4 ++--
 .gitignore                               | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)
 rename .devcontainer/{.env => devcontainer.env} (100%)

diff --git a/.devcontainer/.env b/.devcontainer/devcontainer.env
similarity index 100%
rename from .devcontainer/.env
rename to .devcontainer/devcontainer.env
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index aa4a351..83c092e 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
   silverstripe:
     image: manuth/silverstripe-dev
-    env_file: .env
+    env_file: devcontainer.env
     ports:
       - 8080:80
     volumes:
@@ -11,6 +11,6 @@ services:
       - ../test/website:/var/www/html
   db:
     image: mysql:5
-    env_file: .env
+    env_file: devcontainer.env
     volumes:
       - ./mysql-data:/var/lib/mysql
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 39a1faf..c63f5b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,6 +57,9 @@ typings/
 # Yarn Integrity file
 .yarn-integrity
 
+# dotenv environment variables file
+.env
+
 # parcel-bundler cache (https://parceljs.org/)
 .cache
 
@@ -83,3 +86,6 @@ vendor/
 
 # Build files
 /javascript/
+/css/
+/templates/
+/assets/