Merge branch 'master' into stable

HashBrownCMS · Jul 29, 2018 · e3c78c1 · e3c78c1
2 parents 5cd49b9 + 6670d06
commit e3c78c1
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 8,779 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,6 @@ dump/*
 
 # SSL
 certs/*
+
+# NPM
+package-lock.json
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -25,6 +25,8 @@ services:
             - n-hashbrown
         restart: unless-stopped
         command: "node /opt/hashbrown-cms"
+        environment:
+            - MONGODB_HOST=mongodb
         volumes:
             - "./:/opt/hashbrown-cms"
             - "v-hashbrown-storage:/opt/hashbrown-cms/storage"
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,3 +14,6 @@ dump/* @@
     # SSL
     certs/*
+    # NPM
+    package-lock.json