From 96a5f17494fb6d11ae3415d82e1c4621d87d4fba Mon Sep 17 00:00:00 2001
From: matteob99 <matteo.bocci@gmail.com>
Date: Sun, 17 Mar 2019 19:54:03 +0100
Subject: [PATCH 1/2] add favicon.ico and nginx config for doc, fix Dockerfile,
 remove debug from Dockerfile

---
 .idea/workspace.xml | 169 ++++++++++++++++++++++++++++++++++++++++++++
 Dockerfile          |  11 ++-
 nginx-doc.conf      |  28 ++++++++
 website/favicon.ico | Bin 0 -> 1211 bytes
 4 files changed, 201 insertions(+), 7 deletions(-)
 create mode 100644 .idea/workspace.xml
 create mode 100644 nginx-doc.conf
 create mode 100644 website/favicon.ico

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..3d725e4
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="7e17b851-b64d-462e-b58b-fee2273e38cf" name="Default Changelist" comment="add favicon.ico and nginx config for doc, fix Dockerfile, remove debug from Dockerfile">
+      <change beforePath="$PROJECT_DIR$/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/Dockerfile" afterDir="false" />
+    </list>
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/LICENSE">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/Dockerfile">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="336">
+              <caret line="21" selection-start-line="21" selection-end-line="21" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/nginx-doc.conf">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="448">
+              <caret line="28" selection-start-line="28" selection-end-line="28" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="Git.Settings">
+    <option name="PREVIOUS_COMMIT_AUTHORS">
+      <list>
+        <option value="matteo bocci aka matteob99 &lt;matteo.bocci@gmail.com&gt;" />
+      </list>
+    </option>
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectFrameBounds">
+    <option name="x" value="1918" />
+    <option name="y" value="22" />
+    <option name="width" value="1924" />
+    <option name="height" value="1060" />
+  </component>
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="botogram-porting" type="b2602c69:ProjectViewProjectNode" />
+              <item name="botogram-porting" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../.." />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="7e17b851-b64d-462e-b58b-fee2273e38cf" name="Default Changelist" comment="" />
+      <created>1552848533806</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1552848533806</updated>
+      <workItem from="1552848534951" duration="291000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="291000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="1918" y="22" width="1924" height="1060" extended-state="0" />
+    <editor active="true" />
+    <layout>
+      <window_info id="DB Browser" />
+      <window_info id="Favorites" side_tool="true" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2497332" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info anchor="bottom" id="DB Execution Console" />
+      <window_info anchor="bottom" id="Docker" />
+      <window_info anchor="bottom" id="Floobits" />
+      <window_info anchor="bottom" id="Database Changes" />
+      <window_info anchor="bottom" id="Version Control" />
+      <window_info anchor="bottom" id="Python Console" />
+      <window_info anchor="bottom" id="Terminal" />
+      <window_info anchor="bottom" id="Event Log" side_tool="true" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="right" id="SciView" />
+      <window_info anchor="right" id="Key Promoter X" />
+      <window_info anchor="right" id="Database" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+    </layout>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/.travis.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/LICENSE">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nginx-doc.conf">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="448">
+          <caret line="28" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Dockerfile">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="336">
+          <caret line="21" selection-start-line="21" selection-end-line="21" />
+        </state>
+      </provider>
+    </entry>
+  </component>
+</project>
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 71da6e2..c764016 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,14 +11,11 @@ RUN pip install  -r /requirements-docs.txt
 COPY ./  /botogram
 RUN cd /botogram && invoke docs && cd .netlify && make 
 
-RUN apk add tree
-RUN tree /botogram/.netlify/build
-
 # Image final
 FROM nginx:latest
-ENV botogram_version dev
+ARG botogram_version=dev
+ENV env_botogram_version=$botogram_version
 RUN rm /etc/nginx/conf.d/default.conf
-ADD https://gist.githubusercontent.com/matteb99/4ab0dffc07558273401220f3e0426f5a/raw/7fc18180327f57b6ab8bbbad9f629a0e5955a4a1/gistfile1.txt  /etc/nginx/conf.d/default.conf
-RUN sed 's/RELEASE/'"$botogram_version"'/g' -i /etc/nginx/conf.d/default.conf 
+COPY /nginx-doc.conf  /etc/nginx/conf.d/default.conf
+RUN sed 's/RELEASE/'"$env_botogram_version"'/g' -i /etc/nginx/conf.d/default.conf
 COPY --from=BUILDER /botogram/.netlify/build/ ./botogram
-
diff --git a/nginx-doc.conf b/nginx-doc.conf
new file mode 100644
index 0000000..5a9746a
--- /dev/null
+++ b/nginx-doc.conf
@@ -0,0 +1,28 @@
+server {
+        index index.php index.html;
+        listen 80 default_server;
+        root /botogram;
+        error_log  /var/log/nginx/error.log;
+        access_log /var/log/nginx/access.log;
+        keepalive_timeout 70;
+        location = /favicon.ico {
+                alias /botogram/favicon.ico;
+                }
+                location / {
+                index index.php index.html index.htm;
+                autoindex on;
+                autoindex_exact_size off;
+                autoindex_localtime on;
+                }
+
+        location = /docs {
+                 return 301 /docs/RELEASE/;
+                }
+
+        error_page 404 /404.html;
+
+        location = /404.html {
+                root /botogram/;
+                internal;
+        }
+        }
diff --git a/website/favicon.ico b/website/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..19af7a4d353a778f95b15e98f5bdbf388636f68a
GIT binary patch
literal 1211
zcmeAS@N?(olHy`uVBq!ia0vp^#URYV1SC}yS8ZfqU}^GnaSW-L^X9g{hgP)AfsZqd
zgfC8*67xfS$$~9nTLo02uBd6~G)HY&5t<w2&Z4VyOGKpQf>lPSZWQOlts2ogwyu!l
zOqG<#lx%brdTF!ac(qCR`OWtGi_@Nbzd6tN*W=Sq??^t6YgOQoVG1}_)i9|wbzwrJ
zMuZsGwALnSFf}yl=ih(7f8Rd6wB<*WUcP+UIG=;-?WWzkcQ-mLm@!vxy7#rzk0uRp
zyWZ|U=;rReHZ0pfV$YsEOa5G)@^Q_-d|#!B9Bj>}PoLJ;*RM3+5wmXURMA((f2Gov
zJNo+i*4OV3Tb*jkU}BSw=J+l1Me3C1`pus+=g8xaDMp$cO>T<~XZn=wj$M9vqns|k
z<dm~%o7vgfqobo22E2It_U(CIzV^lX?kht!Nf_9#oX*R_6u18SvuAA^p0A&?b?erd
zGbNW__AIm#O7q_?e<$zz-Mg{(mOguyw)y6s&6|V&EdOX@Z)$34VezAyxo&>R|1<NR
z)w~pP6c7^=yOOn4B+hNhgS`j;{Halzm|*LwIjy#~HZ~?E1;l)6kyl^;|IM48w>+0@
z)BmS#jM%knS5$N~FPpQ~+&&j2yZQPeToc!S`dI_?@0PSP&bz*|$sAvK^;Ksl=l0vN
zadCQ4w{F~sh>B9G*%Y?=>+ioj?+cbzONE4nu3fjT%4VMZ<{}w$6B82~8=oCEQ@u9Y
z3M`4f_ORf}_3OfBJ-xjX<2_prCpPTtQoXzBzxU#cC1qtoW^?Ax50-KFIhJbKmz|xh
zyhiLN|A~eZyK`b=WfQ;t{5kWHPSPj6Y@?YRt0TVsp5nFCDe%KInbZF|yq0Qh0fy_#
zbDuijoPPFK_m6XGs_NZHyNTsDzke@xitKfBE}!H7B=+0CfAcnEnMi4#Q&M}sNnBjK
zC3N#mpF%Oi%IUUNR!VEkOiTjixB~5Gb-Z!=wsKBJX68bRz8O8I^YZiW-@7Lkb@lbv
z-rn94^<OUQQj<5%xc*u-=f%5s&no9Va!J~xQ(aYMWoP&A$B&2%=g7#L2M#dYU3g^4
z?`_Xsy~?Vs-Mekuwq3h^J$8Kk@};I!FB?<i;ls|Kw(i}#SFF4B+LE81zjDuhe^IjQ
z>{;KvasPMA{|?<`!^=@IZ~ol5sq?n7oc8nc+qQlC=6Ow%zgYeb<!Vi;s@k=Feg9X5
z{~8lFna$44%R861eY4yX`%U`UX0zSh+-&6dAF3CqN!*uqQJVPp@#6vunO?W#jS)6-
z=TnT1#$;@biq#8ucW=M^GUc~R0LSA^N;h-NX8PFK*w{Q>60~yr93Qpdz`%t;D|y(O
zFJ^4HnUhmrt=qQc)U-)KyI)V@)8S@4?R0Qczy=)=>M{TEF);l9-z{f<*v?W)16U|A
Nc)I$ztaD0e0sxazG)4db

literal 0
HcmV?d00001


From 88966a5a9524eea2c3de378585f11619ffe6d703 Mon Sep 17 00:00:00 2001
From: Marco Aceti <personale@marcoaceti.it>
Date: Sun, 17 Mar 2019 20:25:00 +0100
Subject: [PATCH 2/2] Fix indentation in nginx-doc.conf and deleted IDE files

---
 .idea/workspace.xml | 169 --------------------------------------------
 nginx-doc.conf      |  49 ++++++-------
 2 files changed, 25 insertions(+), 193 deletions(-)
 delete mode 100644 .idea/workspace.xml

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 3d725e4..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="7e17b851-b64d-462e-b58b-fee2273e38cf" name="Default Changelist" comment="add favicon.ico and nginx config for doc, fix Dockerfile, remove debug from Dockerfile">
-      <change beforePath="$PROJECT_DIR$/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/Dockerfile" afterDir="false" />
-    </list>
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/LICENSE">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/Dockerfile">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="336">
-              <caret line="21" selection-start-line="21" selection-end-line="21" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/nginx-doc.conf">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="448">
-              <caret line="28" selection-start-line="28" selection-end-line="28" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="Git.Settings">
-    <option name="PREVIOUS_COMMIT_AUTHORS">
-      <list>
-        <option value="matteo bocci aka matteob99 &lt;matteo.bocci@gmail.com&gt;" />
-      </list>
-    </option>
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="1918" />
-    <option name="y" value="22" />
-    <option name="width" value="1924" />
-    <option name="height" value="1060" />
-  </component>
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="botogram-porting" type="b2602c69:ProjectViewProjectNode" />
-              <item name="botogram-porting" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="Scope" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../.." />
-    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
-    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="7e17b851-b64d-462e-b58b-fee2273e38cf" name="Default Changelist" comment="" />
-      <created>1552848533806</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1552848533806</updated>
-      <workItem from="1552848534951" duration="291000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="291000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="1918" y="22" width="1924" height="1060" extended-state="0" />
-    <editor active="true" />
-    <layout>
-      <window_info id="DB Browser" />
-      <window_info id="Favorites" side_tool="true" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2497332" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="DB Execution Console" />
-      <window_info anchor="bottom" id="Docker" />
-      <window_info anchor="bottom" id="Floobits" />
-      <window_info anchor="bottom" id="Database Changes" />
-      <window_info anchor="bottom" id="Version Control" />
-      <window_info anchor="bottom" id="Python Console" />
-      <window_info anchor="bottom" id="Terminal" />
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="right" id="SciView" />
-      <window_info anchor="right" id="Key Promoter X" />
-      <window_info anchor="right" id="Database" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-    </layout>
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/.travis.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="416">
-          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/LICENSE">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/nginx-doc.conf">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="448">
-          <caret line="28" selection-start-line="28" selection-end-line="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Dockerfile">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>
\ No newline at end of file
diff --git a/nginx-doc.conf b/nginx-doc.conf
index 5a9746a..adffb7d 100644
--- a/nginx-doc.conf
+++ b/nginx-doc.conf
@@ -1,28 +1,29 @@
 server {
-        index index.php index.html;
-        listen 80 default_server;
-        root /botogram;
-        error_log  /var/log/nginx/error.log;
-        access_log /var/log/nginx/access.log;
-        keepalive_timeout 70;
-        location = /favicon.ico {
-                alias /botogram/favicon.ico;
-                }
-                location / {
-                index index.php index.html index.htm;
-                autoindex on;
-                autoindex_exact_size off;
-                autoindex_localtime on;
-                }
+	index index.php index.html;
+	listen 80 default_server;
+	root /botogram;
+	error_log  /var/log/nginx/error.log;
+	access_log /var/log/nginx/access.log;
+	keepalive_timeout 70;
+	location = /favicon.ico {
+		alias /botogram/favicon.ico;
+	}
+	location / {
+		index index.php index.html index.htm;
+		autoindex on;
+		autoindex_exact_size off;
+		autoindex_localtime on;
+	}
 
-        location = /docs {
-                 return 301 /docs/RELEASE/;
-                }
+	location = /docs {
+		return 301 /docs/RELEASE/;
+	}
 
-        error_page 404 /404.html;
+	error_page 404 /404.html;
+
+	location = /404.html {
+			root /botogram/;
+			internal;
+	}
+}
 
-        location = /404.html {
-                root /botogram/;
-                internal;
-        }
-        }