# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1619168678 -7200
# Node ID 0d6ae55579a59a59fd6dec45b1f0b5976b949b2a
# Parent  87262027cbf5d235cc9e4ff332ec8506864ffe6d
presentation: added docker instructions + updated bullet points at the end.

diff -r 87262027cbf5 -r 0d6ae55579a5 templates/default/presentation/presentation.html
--- a/templates/default/presentation/presentation.html	Fri Apr 23 11:04:36 2021 +0200
+++ b/templates/default/presentation/presentation.html	Fri Apr 23 11:04:38 2021 +0200
@@ -313,6 +313,7 @@
     </div>
 </div>
 
+
 <div id="installation" class="section container">
     <h1 class="title is-2">
         {% trans %}Installation{% endtrans %}
@@ -322,6 +323,8 @@
         <p>{% trans %}If you are on GNU/Linux the recommended way to install Libervia is to use your distribution official packages. Please check your distribution to see if Libervia is available (and request it if it's not). Libervia is available at least on Arch Linux and Debian and its derivated.{% endtrans %}</p>
         <p>{% trans flatpak='<a href="https://flatpak.org/" target="_blank" rel="noreferrer noopener">Flatpak</a>'|safe %}If Libervia is not available or the version is too old, you can use {{flatpak}} (which may be installed by default on some recent distributions) to install it, see below.{% endtrans %}</p>
     </div>
+
+
     <h3 class="subtitle is-3">Flatpak</h3>
     <div class="message is-warning">
         <div class="message-body">
@@ -344,13 +347,54 @@
              {{ download_box(url, name, alias, description) }}
         {% endfor %}
     </div>
-    </ul>
     <div class="box content">
         <p>{% trans %}If the links above are not working, you can use the following commands (supposing that Flatpak is already installed):{% endtrans %}</p>
         <pre>flatpak install --user https://salut-a-toi.org/flatpak/org.libervia.LiberviaDesktop_dev.flatpakref</pre>
         <pre>flatpak install --user https://salut-a-toi.org/flatpak/org.libervia.LiberviaTUI_dev.flatpakref</pre>
         <pre>flatpak install --user https://salut-a-toi.org/flatpak/org.libervia.LiberviaCLI_dev.flatpakref</pre>
     </div>
+
+
+    <h3 class="subtitle is-3">Docker</h3>
+    <div class="message is-warning">
+        <div class="message-body">
+            {% trans %}
+            Those images are development preview, they are not stable and bugs and crashes may happen
+            {% endtrans %}
+        </div>
+    </div>
+    <div class="message is-info">
+        <div class="message-body">
+            <p>
+            {% trans docker_dir='<var>docker</var>'|safe -%}
+            Docker Compose and image building files (Dockerfile) are available in the main repository in {{docker_dir}}
+            directory.
+            {%- endtrans %}
+            </p>
+        </div>
+    </div>
+    <div class="box content">
+        <p>{% trans libervia_web='<strong>Libervia Web</strong>'|safe -%}
+        To try a local demo of {{libervia_web}}, you can use the following instructions (assuming than wget, Docker
+        and Docker Compose are installed):
+        {%- endtrans %}
+        </p>
+<pre>wget https://repos.goffi.org/sat/raw-file/tip/docker/web-demo.yml
+docker-compose -f web-demo.yml up</pre>
+    <p>
+    {%- trans demo_url='<a href="http://localhost:8880" target="_blank">http://localhost:8880</a>'|safe -%}
+    Then launch your web browser on {{demo_url}}
+    {%- endtrans -%}
+    </p>
+    <p>
+    {%- trans remove_instr='<code>docker-compose -f web-demo.yml down</code>'|safe, volume_remove='<code>-v</code>'|safe -%}
+    To remove container images, just enter {{remove_instr}} (add {{volume_remove}}
+    at the end if you also want to remove the associated volume, i.e. data persistence).
+    {%- endtrans -%}
+    </p>
+    </div>
+
+
     <h3 class="subtitle is-3">Android</h3>
     <div class="message is-warning">
         <div class="message-body">
@@ -362,12 +406,15 @@
     <div class="columns">
         {{ download_box("https://ftp.goffi.org/cagou/cagou.apk", "Libervia Mobile", "Cagou", "Android") }}
     </div>
+
+
     <h3 class="subtitle is-3">
         {% trans %}Source Code{% endtrans %}
     </h3>
     <div class="box content">
         <p>{% trans doc_url_open='<a href="/documentation">'|safe,
-                    doc_url_close='</a>'|safe %}If you have some technical ability, you can also install directly from source code, please check {{doc_url_open}}documentation{{doc_url_close}} for details {% endtrans %}</p>
+                    doc_url_close='</a>'|safe %}You can also install directly from source code, please check {{doc_url_open}}documentation{{doc_url_close}} for details {% endtrans %}</p>
+
     </div>
     <h3 class="subtitle is-3">
         {% trans %}Other{% endtrans %}
@@ -375,9 +422,10 @@
     <div class="box content">
         <p>{% trans %}Please note that:{% endtrans %}</p>
         <ul>
-            <li>{% trans %}Libervia Web must be installed from source code, please check documentation for more details{% endtrans %}</li>
-            <li>{% trans %}There are Docker images, but outdated, so we don't list them here. We'll update them as soon as possible.{% endtrans %}</li>
-            <li>{% trans %}Libervia may be installable on many platforms, contact us if you want to see it on a specific one{% endtrans %}</li>
+            <li>{% trans %}Libervia is in heavy development, things evolve quickly.{% endtrans %}</li>
+            <li>{% trans %}Feedbacks are welcome{% endtrans %}</li>
+            <li>{% trans %}Other projects are completing Libervia ecosystem, please check documentation.{% endtrans %}</li>
+            <li>{% trans %}Libervia may be installable on many platforms, contact us if you want to see it on a specific one.{% endtrans %}</li>
         </ul>
     </div>
 </div>