From f60249e3e6e6c3810f5c7ab623e56fc80bbdd680 Mon Sep 17 00:00:00 2001
From: cdinuta <cdinuta@axway.com>
Date: Thu, 30 May 2019 18:18:27 +0300
Subject: [PATCH 01/13] adding flask playing ground

---
 Dockerfile   |  3 ++-
 flask/app.py | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 flask/app.py

diff --git a/Dockerfile b/Dockerfile
index 5c6c466..f37ac3c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,8 @@ RUN pip3 install \
   urllib3 \
   simplejson \
   Jinja2 \
-  jinja2-cli
+  jinja2-cli \
+  flask
 
 
 ## Cleanup
diff --git a/flask/app.py b/flask/app.py
new file mode 100644
index 0000000..9664370
--- /dev/null
+++ b/flask/app.py
@@ -0,0 +1,16 @@
+from flask import Flask, jsonify, request
+
+app = Flask(__name__)
+
+
+@app.route('/')
+def hello():
+    return "Hello"
+
+
+@app.route('/rend', methods=['GET'])
+def get_content():
+    return "tbd", 200
+
+
+app.run()

From 8390a4410beb70298afc118d3882921dea94cb56 Mon Sep 17 00:00:00 2001
From: cdinuta <constantin.dinuta@gmail.com>
Date: Fri, 31 May 2019 00:19:07 +0300
Subject: [PATCH 02/13] added 2 endpoints.

---
 Dockerfile          |  3 ++-
 docker-compose.yml  | 10 ++++++++--
 flask/app.py        | 16 ----------------
 render_flask_app.py | 34 ++++++++++++++++++++++++++++++++++
 4 files changed, 44 insertions(+), 19 deletions(-)
 delete mode 100644 flask/app.py
 create mode 100644 render_flask_app.py

diff --git a/Dockerfile b/Dockerfile
index f37ac3c..5bd8211 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,8 @@ RUN pip3 install \
   simplejson \
   Jinja2 \
   jinja2-cli \
-  flask
+  flask \
+  jsonify
 
 
 ## Cleanup
diff --git a/docker-compose.yml b/docker-compose.yml
index cd29928..3d191c9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,13 +1,19 @@
 version: "3"
+
 services:
   jinja2docker:
     container_name: jinja2docker
     image: dinutac/jinja2docker:latest
     hostname: jinja2docker
-    entrypoint: tail -f /etc/alpine-release #keep the container up to use exec command from docker
+    entrypoint: python3 /home/dev/bin/render_flask_app.py
     environment:
       limit: 'sky' #example env var inserted. you can read it with environ('limit')
     volumes:
       - ./templates:/data
       - ./variables:/variables
-      - ./:/out
+      - ./:/home/dev/bin/
+    ports:
+      - "5000:5000"
+
+    expose:
+      - "5000"
diff --git a/flask/app.py b/flask/app.py
deleted file mode 100644
index 9664370..0000000
--- a/flask/app.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from flask import Flask, jsonify, request
-
-app = Flask(__name__)
-
-
-@app.route('/')
-def hello():
-    return "Hello"
-
-
-@app.route('/rend', methods=['GET'])
-def get_content():
-    return "tbd", 200
-
-
-app.run()
diff --git a/render_flask_app.py b/render_flask_app.py
new file mode 100644
index 0000000..90c36ae
--- /dev/null
+++ b/render_flask_app.py
@@ -0,0 +1,34 @@
+import os
+
+from flask import Flask, jsonify
+
+from render import Render
+
+app = Flask(__name__)
+
+env_vars = {
+    "TEMPLATES_DIR": os.environ.get('TEMPLATES_DIR'),
+    "VARS_DIR": os.environ.get('VARS_DIR'),
+    "TEMPLATE": os.environ.get('TEMPLATE'),
+    "VARIABLES": os.environ.get('VARIABLES'),
+    "TEMPLATES_DIR_FILES": os.listdir(os.environ.get('TEMPLATES_DIR')),
+    "VARS_DIR_FILES": os.listdir(os.environ.get('VARS_DIR'))
+}
+
+
+@app.route('/')
+def get_vars():
+    return jsonify(env_vars), 200
+
+
+@app.route('/rend/<template>/<variables>', methods=['GET'])
+def get_content(template, variables):
+    os.environ['TEMPLATE'] = template
+    os.environ['VARIABLES'] = variables
+    r = Render(os.environ['TEMPLATE'], os.environ['VARIABLES'])
+    result = r.rend_template("dummy")
+
+    return result, 200
+
+
+app.run(host='0.0.0.0')

From c1d7674adb2e56e22ed2f9a54014757711aee361 Mon Sep 17 00:00:00 2001
From: cdinuta <constantin.dinuta@gmail.com>
Date: Fri, 31 May 2019 09:15:41 +0300
Subject: [PATCH 03/13] added 1 more endpoint.

---
 render.py           |  6 +++---
 render_flask_app.py | 21 ++++++++++++++++++++-
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/render.py b/render.py
index db6c8f4..67165f2 100644
--- a/render.py
+++ b/render.py
@@ -37,10 +37,10 @@ def rend_template(self, argv):
         self.env.globals["environ"] = lambda key: os.environ.get(key)
         self.env.globals["get_context"] = lambda: data
 
-        template = self.env.get_template(self.template)
-        sys.stdout.write(template.render(data))
+        template = self.env.get_template(self.template).render(data)
+        sys.stdout.write(template)
 
-        return template.render(data);
+        return template
 
 
 if __name__ == '__main__':
diff --git a/render_flask_app.py b/render_flask_app.py
index 90c36ae..0eff6d3 100644
--- a/render_flask_app.py
+++ b/render_flask_app.py
@@ -1,6 +1,6 @@
 import os
 
-from flask import Flask, jsonify
+from flask import Flask, jsonify, request
 
 from render import Render
 
@@ -27,6 +27,25 @@ def get_content(template, variables):
     os.environ['VARIABLES'] = variables
     r = Render(os.environ['TEMPLATE'], os.environ['VARIABLES'])
     result = r.rend_template("dummy")
+    if result is None:
+        result = ""
+
+    return result, 200
+
+
+@app.route('/rendenv/<template>/<variables>', methods=['POST'])
+def get_content_with_env(template, variables):
+    input_json = request.get_json(force=True)
+    os.environ['TEMPLATE'] = template
+    os.environ['VARIABLES'] = variables
+    for key, value in input_json.items():
+        if key not in os.environ:
+            os.environ[key] = value
+
+    r = Render(os.environ['TEMPLATE'], os.environ['VARIABLES'])
+    result = r.rend_template("dummy")
+    if result is None:
+        result = ""
 
     return result, 200
 

From 8b36f12f246ee9e9ce818900778e6e56f35e6c2a Mon Sep 17 00:00:00 2001
From: cdinuta <constantin.dinuta@gmail.com>
Date: Fri, 31 May 2019 09:19:08 +0300
Subject: [PATCH 04/13] added var to keep env var list

---
 render_flask_app.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/render_flask_app.py b/render_flask_app.py
index 0eff6d3..64b2dcd 100644
--- a/render_flask_app.py
+++ b/render_flask_app.py
@@ -15,6 +15,8 @@
     "VARS_DIR_FILES": os.listdir(os.environ.get('VARS_DIR'))
 }
 
+env_vars_list = os.environ
+
 
 @app.route('/')
 def get_vars():
@@ -39,7 +41,7 @@ def get_content_with_env(template, variables):
     os.environ['TEMPLATE'] = template
     os.environ['VARIABLES'] = variables
     for key, value in input_json.items():
-        if key not in os.environ:
+        if key not in env_vars_list:
             os.environ[key] = value
 
     r = Render(os.environ['TEMPLATE'], os.environ['VARIABLES'])

From 86e84f21e44ab69464e9d609e44a146d7f5e2551 Mon Sep 17 00:00:00 2001
From: cdinuta <cdinuta@axway.com>
Date: Fri, 31 May 2019 17:40:06 +0300
Subject: [PATCH 05/13] reworked structure and added api docs first draft

---
 .travis.yml                                   |  8 ++--
 Dockerfile                                    |  5 ++-
 README.md                                     |  8 ++--
 docker-compose.yml                            |  6 +--
 entitities/__init__.py                        |  0
 render.py => entitities/render.py             | 10 ++---
 {templates => inputs/templates}/json.j2       |  0
 {templates => inputs/templates}/standalone.j2 |  0
 {templates => inputs/templates}/yml.j2        |  0
 {variables => inputs/variables}/json.json     |  2 +-
 {variables => inputs/variables}/variables.yml |  0
 {variables => inputs/variables}/yml.yml       |  0
 main.py                                       |  8 ++++
 main_flask.py                                 |  5 +++
 render_test.py => main_test.py                | 13 ++++---
 rest/__init__.py                              | 14 +++++++
 rest/flask_config.py                          |  3 ++
 .../render_flask_app.py                       | 39 +++++++++++--------
 18 files changed, 79 insertions(+), 42 deletions(-)
 create mode 100644 entitities/__init__.py
 rename render.py => entitities/render.py (85%)
 rename {templates => inputs/templates}/json.j2 (100%)
 rename {templates => inputs/templates}/standalone.j2 (100%)
 rename {templates => inputs/templates}/yml.j2 (100%)
 rename {variables => inputs/variables}/json.json (70%)
 rename {variables => inputs/variables}/variables.yml (100%)
 rename {variables => inputs/variables}/yml.yml (100%)
 create mode 100644 main.py
 create mode 100644 main_flask.py
 rename render_test.py => main_test.py (80%)
 create mode 100644 rest/__init__.py
 create mode 100644 rest/flask_config.py
 rename render_flask_app.py => rest/render_flask_app.py (60%)

diff --git a/.travis.yml b/.travis.yml
index 42eb4db..2348f3d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,13 +16,13 @@ script:
   - docker-compose down -v
 
   - docker run -i
-    -v $TRAVIS_BUILD_DIR/templates:/data
-    -v $TRAVIS_BUILD_DIR/variables:/variables  -e TEMPLATE=standalone.j2
+    -v $TRAVIS_BUILD_DIR/inputs/templates:/data
+    -v $TRAVIS_BUILD_DIR/inputs/variables:/variables  -e TEMPLATE=standalone.j2
     -e VARIABLES=variables.yml -e DATABASE=mysql56 -e IMAGE=latest dinutac/jinja2docker:latest
 
   - docker run --entrypoint jinja2
-    -v $TRAVIS_BUILD_DIR/templates:/data
-    -v $TRAVIS_BUILD_DIR/variables:/variables
+    -v $TRAVIS_BUILD_DIR/inputs/templates:/data
+    -v $TRAVIS_BUILD_DIR/inputs/variables:/variables
     dinutac/jinja2docker:latest
     /data/json.j2 /variables/json.json --format=json
 
diff --git a/Dockerfile b/Dockerfile
index 5bd8211..768cb52 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,6 +20,7 @@ RUN pip3 install \
   Jinja2 \
   jinja2-cli \
   flask \
+  flask_restplus\
   jsonify
 
 
@@ -54,9 +55,9 @@ ENV OUT_DIR out
 ENV TEMPLATE docker-compose.j2
 ENV VARIABLES variables.yml
 
-COPY *.py /home/dev/bin/
+COPY ./* /home/dev/bin/
 RUN chown -R dev:dev /home/dev && chmod 700 $SCRIPTS_DIR*.py
  
 WORKDIR /data
 
-ENTRYPOINT ["/home/dev/bin/render.py"]
+ENTRYPOINT ["/home/dev/bin/main.py"]
diff --git a/README.md b/README.md
index 943d82e..2d06a10 100644
--- a/README.md
+++ b/README.md
@@ -24,8 +24,8 @@ docker run -i   -v **your_jinja2_template_folder**:/data \
 
 Example: 
 ```
-docker run -i   -v C:\Users\cdinuta\IdeaProjects\jinja2docker\templates:/data \ 
--v C:\Users\cdinuta\IdeaProjects\jinja2docker\variables:/variables   -e TEMPLATE=standalone.j2 \ 
+docker run -i   -v C:\Users\cdinuta\IdeaProjects\jinja2docker\inputs\templates:/data \ 
+-v C:\Users\cdinuta\IdeaProjects\jinja2docker\inputs\variables:/variables   -e TEMPLATE=standalone.j2 \ 
 -e VARIABLES=variables.yml -e DATABASE=mysql56 -e IMAGE=latest dinutac/jinja2docker:latest > docker-compose.yml
 ```
 
@@ -94,8 +94,8 @@ jinja2 /data/standalone.j2 /variables/variables.yml --format=yml > docker-compos
 #### 2. Hybrid call 
 ```
 docker run --entrypoint jinja2   \
--v C:\Users\cdinuta\IdeaProjects\jinja2docker\templates:/data \
--v C:\Users\cdinuta\IdeaProjects\jinja2docker\variables:/variables \
+-v C:\Users\cdinuta\IdeaProjects\jinja2docker\inputs\templates:/data \
+-v C:\Users\cdinuta\IdeaProjects\jinja2docker\inputs\variables:/variables \
 dinutac/jinja2docker:latest \
 /data/json.j2 /variables/json.json --format=json
 ```
diff --git a/docker-compose.yml b/docker-compose.yml
index 3d191c9..c9e2a40 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,12 +5,12 @@ services:
     container_name: jinja2docker
     image: dinutac/jinja2docker:latest
     hostname: jinja2docker
-    entrypoint: python3 /home/dev/bin/render_flask_app.py
+    entrypoint: python3 /home/dev/bin/main_flask.py
     environment:
       limit: 'sky' #example env var inserted. you can read it with environ('limit')
     volumes:
-      - ./templates:/data
-      - ./variables:/variables
+      - ./inputs/templates:/data
+      - ./inputs/variables:/variables
       - ./:/home/dev/bin/
     ports:
       - "5000:5000"
diff --git a/entitities/__init__.py b/entitities/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/render.py b/entitities/render.py
similarity index 85%
rename from render.py
rename to entitities/render.py
index 67165f2..855da95 100644
--- a/render.py
+++ b/entitities/render.py
@@ -37,12 +37,10 @@ def rend_template(self, argv):
         self.env.globals["environ"] = lambda key: os.environ.get(key)
         self.env.globals["get_context"] = lambda: data
 
-        template = self.env.get_template(self.template).render(data)
+        try:
+            template = self.env.get_template(self.template).render(data)
+        except Exception as e:
+            raise e
         sys.stdout.write(template)
 
         return template
-
-
-if __name__ == '__main__':
-    render = Render(os.environ.get('TEMPLATE'), os.environ.get('VARIABLES'))
-    render.rend_template(sys.argv[1:])
diff --git a/templates/json.j2 b/inputs/templates/json.j2
similarity index 100%
rename from templates/json.j2
rename to inputs/templates/json.j2
diff --git a/templates/standalone.j2 b/inputs/templates/standalone.j2
similarity index 100%
rename from templates/standalone.j2
rename to inputs/templates/standalone.j2
diff --git a/templates/yml.j2 b/inputs/templates/yml.j2
similarity index 100%
rename from templates/yml.j2
rename to inputs/templates/yml.j2
diff --git a/variables/json.json b/inputs/variables/json.json
similarity index 70%
rename from variables/json.json
rename to inputs/variables/json.json
index 01f4d9e..2cc1e01 100644
--- a/variables/json.json
+++ b/inputs/variables/json.json
@@ -1,5 +1,5 @@
 {
-  "os" : "windows",
+  "os": "windows",
   "version": 10,
   "installed_apps": "json"
 }
\ No newline at end of file
diff --git a/variables/variables.yml b/inputs/variables/variables.yml
similarity index 100%
rename from variables/variables.yml
rename to inputs/variables/variables.yml
diff --git a/variables/yml.yml b/inputs/variables/yml.yml
similarity index 100%
rename from variables/yml.yml
rename to inputs/variables/yml.yml
diff --git a/main.py b/main.py
new file mode 100644
index 0000000..39798da
--- /dev/null
+++ b/main.py
@@ -0,0 +1,8 @@
+import os
+import sys
+
+from entitities.render import Render
+
+if __name__ == '__main__':
+    render = Render(os.environ.get('TEMPLATE'), os.environ.get('VARIABLES'))
+    render.rend_template(sys.argv[1:])
diff --git a/main_flask.py b/main_flask.py
new file mode 100644
index 0000000..5e490b0
--- /dev/null
+++ b/main_flask.py
@@ -0,0 +1,5 @@
+from rest.render_flask_app import init_app, app
+
+if __name__ == "__main__":
+    init_app(app)
+    app.run(host='0.0.0.0')
diff --git a/render_test.py b/main_test.py
similarity index 80%
rename from render_test.py
rename to main_test.py
index 0669e8a..6de0b2d 100644
--- a/render_test.py
+++ b/main_test.py
@@ -1,14 +1,17 @@
 #!/usr/bin/env python3
+import os
 import unittest
 
-from render import *
+import yaml
+
+from entitities.render import Render
 
 
 class RenderTestCase(unittest.TestCase):
 
     def test_json(self):
-        os.environ['TEMPLATE'] = "json.j2";
-        os.environ['VARIABLES'] = "json.json";
+        os.environ['TEMPLATE'] = "json.j2"
+        os.environ['VARIABLES'] = "json.json"
         r = Render(os.environ['TEMPLATE'], os.environ['VARIABLES'])
 
         template = yaml.load(r.rend_template("dummy"), Loader=yaml.Loader)
@@ -19,8 +22,8 @@ def test_json(self):
         self.assertEqual(template.get("installed_apps"), data.get("installed_apps"))
 
     def test_yml(self):
-        os.environ['TEMPLATE'] = "yml.j2";
-        os.environ['VARIABLES'] = "yml.yml";
+        os.environ['TEMPLATE'] = "yml.j2"
+        os.environ['VARIABLES'] = "yml.yml"
         r = Render(os.environ['TEMPLATE'], os.environ['VARIABLES'])
 
         template = yaml.load(r.rend_template("dummy"), Loader=yaml.Loader)
diff --git a/rest/__init__.py b/rest/__init__.py
new file mode 100644
index 0000000..8e768b0
--- /dev/null
+++ b/rest/__init__.py
@@ -0,0 +1,14 @@
+from flask import Flask
+
+print("Start init")
+
+
+def create_app():
+    print("Start init flask!")
+    app = Flask(__name__, instance_relative_config=False)
+    app.config.from_object('rest.flask_config.Config')
+    with app.app_context():
+        return app
+
+
+print("End init")
diff --git a/rest/flask_config.py b/rest/flask_config.py
new file mode 100644
index 0000000..dda6466
--- /dev/null
+++ b/rest/flask_config.py
@@ -0,0 +1,3 @@
+class Config:
+    TESTING = True
+    FLASK_DEBUG = True
diff --git a/render_flask_app.py b/rest/render_flask_app.py
similarity index 60%
rename from render_flask_app.py
rename to rest/render_flask_app.py
index 64b2dcd..e8e747a 100644
--- a/render_flask_app.py
+++ b/rest/render_flask_app.py
@@ -1,10 +1,9 @@
 import os
 
-from flask import Flask, jsonify, request
+from flask import Flask, jsonify, request, Blueprint
+from flask_restplus import Api
 
-from render import Render
-
-app = Flask(__name__)
+from entitities.render import Render
 
 env_vars = {
     "TEMPLATES_DIR": os.environ.get('TEMPLATES_DIR'),
@@ -15,10 +14,17 @@
     "VARS_DIR_FILES": os.listdir(os.environ.get('VARS_DIR'))
 }
 
-env_vars_list = os.environ
+app = Flask(__name__)
+api = Api(app)
+
 
+def init_app(flask_app):
+    blueprint = Blueprint('api', __name__, url_prefix='/api')
+    api.init_app(blueprint)
+    flask_app.register_blueprint(blueprint)
 
-@app.route('/')
+
+@app.route('/env')
 def get_vars():
     return jsonify(env_vars), 200
 
@@ -28,28 +34,27 @@ def get_content(template, variables):
     os.environ['TEMPLATE'] = template
     os.environ['VARIABLES'] = variables
     r = Render(os.environ['TEMPLATE'], os.environ['VARIABLES'])
-    result = r.rend_template("dummy")
-    if result is None:
-        result = ""
+    try:
+        result = r.rend_template("dummy")
+    except Exception as e:
+        result = "Exception({0})".format(e.__str__())
 
     return result, 200
 
 
-@app.route('/rendenv/<template>/<variables>', methods=['POST'])
+@app.route('/rendwithenv/<template>/<variables>', methods=['POST'])
 def get_content_with_env(template, variables):
     input_json = request.get_json(force=True)
     os.environ['TEMPLATE'] = template
     os.environ['VARIABLES'] = variables
     for key, value in input_json.items():
-        if key not in env_vars_list:
+        if key not in env_vars:
             os.environ[key] = value
 
     r = Render(os.environ['TEMPLATE'], os.environ['VARIABLES'])
-    result = r.rend_template("dummy")
-    if result is None:
-        result = ""
+    try:
+        result = r.rend_template("dummy")
+    except Exception as e:
+        result = "Exception({0})".format(e.__str__())
 
     return result, 200
-
-
-app.run(host='0.0.0.0')

From 6af32d764365a7d1bcf688a8bb403d0c208f5dab Mon Sep 17 00:00:00 2001
From: cdinuta <constantin.dinuta@gmail.com>
Date: Sat, 1 Jun 2019 00:14:10 +0300
Subject: [PATCH 06/13] reworked structure and added server tests

---
 .travis.yml                          |  2 +-
 Dockerfile                           |  8 ++++----
 docker-compose.yml                   |  5 +++--
 main.py                              |  2 ++
 main_flask.py                        |  2 ++
 rest/render_flask_app.py             |  5 ++++-
 tests/__init__.py                    |  0
 tests/flask_rest_test.py             | 20 ++++++++++++++++++++
 main_test.py => tests/render_test.py |  0
 9 files changed, 36 insertions(+), 8 deletions(-)
 create mode 100644 tests/__init__.py
 create mode 100644 tests/flask_rest_test.py
 rename main_test.py => tests/render_test.py (100%)

diff --git a/.travis.yml b/.travis.yml
index 2348f3d..029eb6c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ services:
   - docker
 
 env:
-  SCRIPTS_DIR: /home/dev/bin/
+  SCRIPTS_DIR: /home/dev/scripts/
 
 before_install:
   - docker build -t dinutac/jinja2docker:latest .
diff --git a/Dockerfile b/Dockerfile
index 768cb52..cfcbc1b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,14 +50,14 @@ VOLUME ["/variables"]
 
 ENV TEMPLATES_DIR /data
 ENV VARS_DIR /variables
-ENV SCRIPTS_DIR /home/dev/bin/
+ENV SCRIPTS_DIR /home/dev/scripts
 ENV OUT_DIR out
 ENV TEMPLATE docker-compose.j2
 ENV VARIABLES variables.yml
 
-COPY ./* /home/dev/bin/
-RUN chown -R dev:dev /home/dev && chmod 700 $SCRIPTS_DIR*.py
+ADD . $SCRIPTS_DIR/
+RUN chown -R dev:dev /home/dev && chmod +x $SCRIPTS_DIR/*.py
  
 WORKDIR /data
 
-ENTRYPOINT ["/home/dev/bin/main.py"]
+ENTRYPOINT ["python3 $SCRIPTS_DIR/main.py"]
diff --git a/docker-compose.yml b/docker-compose.yml
index c9e2a40..9cf9cf0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,13 +5,14 @@ services:
     container_name: jinja2docker
     image: dinutac/jinja2docker:latest
     hostname: jinja2docker
-    entrypoint: python3 /home/dev/bin/main_flask.py
+    entrypoint: python3 /home/dev/scripts/main_flask.py
+#    entrypoint: tail -f /etc/alpine-release
     environment:
       limit: 'sky' #example env var inserted. you can read it with environ('limit')
     volumes:
       - ./inputs/templates:/data
       - ./inputs/variables:/variables
-      - ./:/home/dev/bin/
+      - ./:/home/dev/scripts/
     ports:
       - "5000:5000"
 
diff --git a/main.py b/main.py
index 39798da..94edfd2 100644
--- a/main.py
+++ b/main.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 import os
 import sys
 
diff --git a/main_flask.py b/main_flask.py
index 5e490b0..4358d3d 100644
--- a/main_flask.py
+++ b/main_flask.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 from rest.render_flask_app import init_app, app
 
 if __name__ == "__main__":
diff --git a/rest/render_flask_app.py b/rest/render_flask_app.py
index e8e747a..bcbd876 100644
--- a/rest/render_flask_app.py
+++ b/rest/render_flask_app.py
@@ -11,7 +11,8 @@
     "TEMPLATE": os.environ.get('TEMPLATE'),
     "VARIABLES": os.environ.get('VARIABLES'),
     "TEMPLATES_DIR_FILES": os.listdir(os.environ.get('TEMPLATES_DIR')),
-    "VARS_DIR_FILES": os.listdir(os.environ.get('VARS_DIR'))
+    "VARS_DIR_FILES": os.listdir(os.environ.get('VARS_DIR')),
+    "PATH": os.environ.get('PATH')
 }
 
 app = Flask(__name__)
@@ -24,6 +25,8 @@ def init_app(flask_app):
     flask_app.register_blueprint(blueprint)
 
 
+# TODO define swagger specs
+
 @app.route('/env')
 def get_vars():
     return jsonify(env_vars), 200
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/flask_rest_test.py b/tests/flask_rest_test.py
new file mode 100644
index 0000000..fca1092
--- /dev/null
+++ b/tests/flask_rest_test.py
@@ -0,0 +1,20 @@
+#!/usr/bin/env python3
+import os
+import unittest
+
+import requests
+from flask import json
+
+
+class FlaskServerTestCase(unittest.TestCase):
+    server = "http://0.0.0.0:5000"
+
+    def test_env_endpoint(self):
+        response = json.loads(requests.get(self.server + "/env").text)
+        self.assertEqual(len(response), 7)
+        self.assertEqual(response.get('VARS_DIR'), os.environ['VARS_DIR'])
+        self.assertEqual(response.get('TEMPLATES_DIR'), os.environ['TEMPLATES_DIR'])
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/main_test.py b/tests/render_test.py
similarity index 100%
rename from main_test.py
rename to tests/render_test.py

From a492056f61b6adaa8df601494ce1799d7879bfd9 Mon Sep 17 00:00:00 2001
From: cdinuta <constantin.dinuta@gmail.com>
Date: Sat, 1 Jun 2019 00:17:55 +0300
Subject: [PATCH 07/13] added package

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index cfcbc1b..5387636 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,8 @@ RUN pip3 install \
   jinja2-cli \
   flask \
   flask_restplus\
-  jsonify
+  jsonify \
+  requests
 
 
 ## Cleanup

From c43c8d3a3374412ac67fce1210aa79583f7f0918 Mon Sep 17 00:00:00 2001
From: cdinuta <constantin.dinuta@gmail.com>
Date: Sat, 1 Jun 2019 00:43:02 +0300
Subject: [PATCH 08/13] simplified dockerfile

---
 Dockerfile | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5387636..9d2e0a8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,5 @@
 FROM alpine:latest
 
-ENV PUID 1000
-ENV PGID 1000
-
-
 RUN apk add --update python3 && \
     pip3 install --upgrade pip setuptools
 
@@ -31,19 +27,10 @@ RUN apk del \
   make && \
   rm -rf /var/cache/apk/*
 
-# create dev user
-RUN addgroup -g $PGID dev && \
-  adduser -h /config -u $PUID -H -D -G dev -s /bin/bash dev && \
-  mkdir -p /home/dev/bin && \
-  sed -ri 's/(wheel:x:10:root)/\1,dev/' /etc/group && \
-  sed -ri 's/# %wheel ALL=\(ALL\) NOPASSWD: ALL/%wheel ALL=\(ALL\) NOPASSWD: ALL/' /etc/sudoers
-  
 # Create a shared data volume
 # create an empty file, otherwise the volume will
 # belong to root.
-RUN mkdir /data/ && \
- touch /data/.extra && \
- chown -R dev:dev /data
+RUN mkdir /data/
 
 ## Expose some volumes
 VOLUME ["/data"]
@@ -57,8 +44,8 @@ ENV TEMPLATE docker-compose.j2
 ENV VARIABLES variables.yml
 
 ADD . $SCRIPTS_DIR/
-RUN chown -R dev:dev /home/dev && chmod +x $SCRIPTS_DIR/*.py
+RUN chmod +x $SCRIPTS_DIR/*.py
  
 WORKDIR /data
 
-ENTRYPOINT ["python3 $SCRIPTS_DIR/main.py"]
+ENTRYPOINT ["python3", "$SCRIPTS_DIR/main.py"]

From beae52610f6adda44b74bc1d90681cd43fcd7c3b Mon Sep 17 00:00:00 2001
From: cdinuta <constantin.dinuta@gmail.com>
Date: Sat, 1 Jun 2019 08:45:23 +0300
Subject: [PATCH 09/13] changed entrypoint

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 9d2e0a8..81b3929 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,4 +48,4 @@ RUN chmod +x $SCRIPTS_DIR/*.py
  
 WORKDIR /data
 
-ENTRYPOINT ["python3", "$SCRIPTS_DIR/main.py"]
+ENTRYPOINT ["python3", "/home/dev/scripts/main.py"]

From 30a264722a0fddb6904796a69d6bb51553a91c2b Mon Sep 17 00:00:00 2001
From: cdinuta <constantin.dinuta@gmail.com>
Date: Sat, 1 Jun 2019 11:13:02 +0300
Subject: [PATCH 10/13] added rest rests for flask server

---
 .travis.yml              |  4 ++++
 inputs/templates/json.j2 |  4 ++--
 inputs/templates/yml.j2  |  4 ++--
 tests/flask_rest_test.py | 36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 029eb6c..ef47a2a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,14 @@
 language: python
 
+python:
+  - "3.7"
+
 services:
   - docker
 
 env:
   SCRIPTS_DIR: /home/dev/scripts/
+  SERVER: "127.0.0.1:5000" #not used atm
 
 before_install:
   - docker build -t dinutac/jinja2docker:latest .
diff --git a/inputs/templates/json.j2 b/inputs/templates/json.j2
index 6538caa..f680dd9 100644
--- a/inputs/templates/json.j2
+++ b/inputs/templates/json.j2
@@ -1,5 +1,5 @@
 {
-    "os": {{os}},
+    "os": "{{os}}",
     "version": {{version}},
-    "installed_apps": {{installed_apps}}
+    "installed_apps": "{{installed_apps}}"
 }
\ No newline at end of file
diff --git a/inputs/templates/yml.j2 b/inputs/templates/yml.j2
index a3b4abb..8053c76 100644
--- a/inputs/templates/yml.j2
+++ b/inputs/templates/yml.j2
@@ -1,3 +1,3 @@
-"os": {{os}}
+"os": "{{os}}"
 "version": {{version}}
-"installed_apps": {{installed_apps}}
\ No newline at end of file
+"installed_apps": "{{installed_apps}}"
\ No newline at end of file
diff --git a/tests/flask_rest_test.py b/tests/flask_rest_test.py
index fca1092..a13c3a5 100644
--- a/tests/flask_rest_test.py
+++ b/tests/flask_rest_test.py
@@ -3,7 +3,9 @@
 import unittest
 
 import requests
+import yaml
 from flask import json
+from parameterized import parameterized
 
 
 class FlaskServerTestCase(unittest.TestCase):
@@ -15,6 +17,40 @@ def test_env_endpoint(self):
         self.assertEqual(response.get('VARS_DIR'), os.environ['VARS_DIR'])
         self.assertEqual(response.get('TEMPLATES_DIR'), os.environ['TEMPLATES_DIR'])
 
+    @parameterized.expand([
+        ("json.j2", "json.json"),
+        ("yml.j2", "yml.yml")
+    ])
+    def test_rend_endpoint(self, template, variables):
+        response = yaml.load(requests.get(self.server + f"/rend/{template}/{variables}").text)
+        self.assertEqual(len(response), 3)
+
+    @parameterized.expand([
+        ("json.j2", "doesnotexists.json"),
+        ("yml.j2", "doesnotexists.yml")
+    ])
+    def test_rend_endpoint(self, template, variables):
+        expected = f"Exception([Errno 2] No such file or directory: \'/variables/{variables}\')"
+        response = requests.get(self.server + f"/rend/{template}/{variables}").text
+        self.assertEqual(expected, response)
+
+    @parameterized.expand([
+        ("doesnotexists.j2", "json.json"),
+        ("doesnotexists.j2", "yml.yml")
+    ])
+    def test_rend_endpoint(self, template, variables):
+        expected = f"Exception({template})"
+        response = requests.get(self.server + f"/rend/{template}/{variables}").text
+        self.assertEqual(expected, response)
+
+    # @parameterized.expand([
+    #     ("standalone.j2", "variables.yml")
+    # ])
+    # def test_rendwithenv_endpoint(self, template, variables):
+    #     payload = {'DATABASE': 'mysql56', 'IMAGE': 'latest'}
+    #     response = yaml.load(requests.post(self.server + f"/rendwithenv/{template}/{variables}", data=payload).text)
+    #     self.assertEqual(len(response), 3)
+
 
 if __name__ == '__main__':
     unittest.main()

From c3597871e29b73a964e0b98b19cfa4a2e9ad217c Mon Sep 17 00:00:00 2001
From: cdinuta <constantin.dinuta@gmail.com>
Date: Sat, 1 Jun 2019 11:16:16 +0300
Subject: [PATCH 11/13] added rest rests for flask server

---
 .travis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ef47a2a..ea190cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,5 @@
 language: python
 
-python:
-  - "3.7"
-
 services:
   - docker
 

From aedce8f48ba6f0115a89cb5468ededffa3ba9269 Mon Sep 17 00:00:00 2001
From: cdinuta <constantin.dinuta@gmail.com>
Date: Sat, 1 Jun 2019 11:23:00 +0300
Subject: [PATCH 12/13] added module

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 81b3929..e4082b9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,8 @@ RUN pip3 install \
   flask \
   flask_restplus\
   jsonify \
-  requests
+  requests \
+  parameterized
 
 
 ## Cleanup

From ae58c1da1e62c2f08adbeddba0f469880656acb8 Mon Sep 17 00:00:00 2001
From: cdinuta <constantin.dinuta@gmail.com>
Date: Sat, 1 Jun 2019 12:00:08 +0300
Subject: [PATCH 13/13] updated readme

---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2d06a10..b2400dc 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ The recommendation is either paste selectively smaller chunks of yaml or use jso
 
 ## Latest updates  
 
-### Integrated Jinja2 Cli 
+### 1. Integrated Jinja2 Cli 
 
 https://github.com/mattrobenolt/jinja2-cli  
 
@@ -101,3 +101,7 @@ dinutac/jinja2docker:latest \
 ```
 
 ! observe that jinja2 is called before image name and the arguments after
+
+
+### 2. Added flask restful server
+Info in wiki: https://github.com/dinuta/jinja2docker/wiki
\ No newline at end of file