From 5f654516610102917cadd8b87c25db14be921114 Mon Sep 17 00:00:00 2001
From: David Baldwynn <shorerydr10@live.com>
Date: Thu, 23 Nov 2017 18:40:17 -0800
Subject: [PATCH 1/2] added docker-compose file for development work

---
 Dockerfile-dev      |  21 +++++++++++++++++++++
 docker-compose.yaml |  44 ++++++++++++++++++++++++++++++++++++++++++++
 dump.rdb            | Bin 76 -> 0 bytes
 3 files changed, 65 insertions(+)
 create mode 100644 Dockerfile-dev
 create mode 100644 docker-compose.yaml
 delete mode 100644 dump.rdb

diff --git a/Dockerfile-dev b/Dockerfile-dev
new file mode 100644
index 00000000..5c041477
--- /dev/null
+++ b/Dockerfile-dev
@@ -0,0 +1,21 @@
+# Build:
+# docker build -t tellform-prod -f ./Dockerfile-production .
+#
+# Run:
+# docker run -it tellform-prod
+
+FROM node:7
+MAINTAINER David Baldwynn <team@tellform.com>
+
+# Install NPM Global Libraries
+RUN npm install --quiet -g grunt bower && npm cache clean
+
+ADD . /code
+WORKDIR /code
+
+RUN npm install --quiet
+RUN bower install --interactive-mode=false --allow-root
+RUN grunt build
+
+# Run TellForm server
+CMD ["grunt"]
diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 00000000..c31c0850
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,44 @@
+version: "3"
+services:
+  tellform:
+    build:
+      context: .
+      dockerfile: ./Dockerfile-dev
+    volumes:
+      - .:/code
+    ports:
+      - "5000:5000"
+      - 587:587
+    env_file:
+      - .env
+    links:
+      - mongo
+      - redis
+    depends_on:
+      - mongo
+      - redis
+  redis:
+    restart: always
+    image: redis
+    volumes:
+      - "$ROOT/redis:/data"
+    ports:
+      - "6379:6379"
+  web:
+    image: tellform/nginx:stable
+    restart: always
+    ports:
+      - "80:80"
+      - "443:443"
+      - "20523:20523"
+    env_file:
+      - .env
+    volumes: 
+      - "$ROOT/certs:/certs"
+  mongo:
+    restart: always
+    image: mongo
+    volumes: 
+      - "$ROOT/mongo:/data"
+    ports:
+      - "27107:27107"
\ No newline at end of file
diff --git a/dump.rdb b/dump.rdb
deleted file mode 100644
index c6e61e2af22236acfff1aa86fad52a75ef8fba48..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 76
zcmWG?b@2=~FfcIx#aWb^l3A=<mRiJWtY@TW@rw&0kd#?ce8AxsYjR0uZt9_s8Q&v+
dag-LPrs(FT<{tVmlaJwlbtKc?<?UOx0suOcAA0}*


From d8c5b005815dbc7fea868bfd6ecd7f1d9c83b33a Mon Sep 17 00:00:00 2001
From: David Baldwynn <shorerydr10@live.com>
Date: Thu, 23 Nov 2017 18:43:32 -0800
Subject: [PATCH 2/2] bumped version in bower.json and package.json

---
 bower.json   | 6 +++---
 package.json | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bower.json b/bower.json
index 4336c3ac..813d5767 100755
--- a/bower.json
+++ b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "tellform",
   "description": "Opensource alternative to TypeForm",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "homepage": "https://github.com/tellform/tellform",
   "authors": [
     "David Baldwynn <polydaic@gmail.com> (http://baldwynn.me)"
@@ -41,10 +41,10 @@
     "socket.io-client": "^1.7.2",
     "css-toggle-switch": "^4.0.2",
     "angular-strap": "^2.3.12",
-    "textAngular": "^1.5.16",
     "angular-ui-select": "^0.19.8",
     "angular-bootstrap-switch": "^0.5.2",
-    "jquery": "^3.2.1"
+    "jquery": "^3.2.1",
+    "textAngular": "^1.5.16"
   },
   "resolutions": {
     "angular-bootstrap": "^0.14.0",
diff --git a/package.json b/package.json
index 5f3ba4c4..732bf392 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "TellForm",
   "description": "Opensource alternative to TypeForm",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "homepage": "https://github.com/tellform/tellform",
   "authors": [
     "David Baldwynn <polydaic@gmail.com> (http://baldwynn.me)"