Add docker documentation
diff --git a/documentation/html/4diacIDE/dynamicTypeLoader.html b/documentation/html/4diacIDE/dynamicTypeLoader.html
index 367e2be..4f45c8a 100644
--- a/documentation/html/4diacIDE/dynamicTypeLoader.html
+++ b/documentation/html/4diacIDE/dynamicTypeLoader.html
@@ -74,7 +74,7 @@
<h2 id="CompileForte"> Compiling Forte with the LuaJit</h2>
-<p> At first download the 4diac FORTE source from <a href="https://www.eclipse.org/4diac/en_dow.php" target="_blank"> here<a/> or clone the 4diac FORTE repository.</p>
+<p> At first download the 4diac FORTE source from <a href="https://www.eclipse.org/4diac/en_dow.php" target="_blank"> here</a> or clone the 4diac FORTE repository.</p>
<div class="code">$ git clone git://git.eclipse.org/gitroot/4diac/org.eclipse.4diac.forte.git</div>
@@ -82,7 +82,7 @@
Open CMake and set the source folder, to the folder where your 4diac FORTE source files are in.
Then set the build folder, to folder where you want to build the 4diac FORTE in.</p>
-<p> Before configuring the Lua options, please enable all options, shown in this <a href="../../html/installation/install.html#generateFilesForCompiling" targe="_blank"> tutorial</a>.
+<p> Before configuring the Lua options, please enable all options, shown in this <a href="../../html/installation/install.html#generateFilesForCompiling" target="_blank"> tutorial</a>.
Before pressing generate, we have to configure all Lua options. </p>
<ol>
<li> Set FORTE_USE_LUATYPES to LUAJIT and press configure</li>
@@ -95,9 +95,9 @@
<img src="../../html/4diacIDE/img/Step7/FORTECompiled.png" alt="Compile Forte"/>
-<h2 id="enableDTL"> Enabling the Dynmic Type Loader</h2>
+<h2 id="enableDTL"> Enabling the Dynamic Type Loader</h2>
-<p>Before you can use theDynmic Type Loader, you have to enable it in the 4diac IDE.</p>
+<p>Before you can use theDynamic Type Loader, you have to enable it in the 4diac IDE.</p>
<ol>
<li>Then choose your system application, where you can see all your resources</li>
<li>Then choose the FORTE resources, where you want to deploy the new FBs to</li>
diff --git a/documentation/html/communication/arrowhead.html b/documentation/html/communication/arrowhead.html
index 31a8d41..368aece 100644
--- a/documentation/html/communication/arrowhead.html
+++ b/documentation/html/communication/arrowhead.html
@@ -81,7 +81,7 @@
<p>The following gives informatoin about the purposse of all FBs and SubApps in the library. The parameters of each one of them is documented in the FBs and SubApps itself.</p>
-<p>The ones marked in bold are the top level, and usually, the only ones that you need in order to quickly use the library.</p>
+<p>The ones marked like <span class="specificText">this text</span> are the top level, and usually, the only ones that you need in order to quickly use the library.</p>
<ul>
<li>Common
@@ -192,9 +192,9 @@
</li>
</ul>
-<h2>Examples</h2>
+<h2>Examples and Function Blocks</h2>
-<p>To see some examples on how the Function Blocks are used, you can check the <a href="https://git.eclipse.org/c/4diac/org.eclipse.4diac.examples.git" target="_blank">examples respository</a></p>
+<p>To see some examples on how the Function Blocks are used, you can check the <a href="https://git.eclipse.org/c/4diac/org.eclipse.4diac.examples.git" target="_blank">examples respository</a>. The FBs are not directly to be found in the IDE, but you'll find them in the example repository.</p>
<h1>Where to go from here?</h1>
diff --git a/documentation/html/development/ideUpdateTargetPlatform.html b/documentation/html/development/ideUpdateTargetPlatform.html
index dc8c116..bff2114 100644
--- a/documentation/html/development/ideUpdateTargetPlatform.html
+++ b/documentation/html/development/ideUpdateTargetPlatform.html
@@ -37,6 +37,7 @@
<li>GEF (MVC) SDK, org.eclipse.gef.sdk.feature.group</li>
<li>Xtext Complete SDK, org.eclipse.xtext.sdk.feature.group</li>
<li>Eclipse Platform Launcher Executables</li>
+ <li>Git integration for Eclipse</li>
</ul>
</li>
</ul>
diff --git a/documentation/html/installation/docker.html b/documentation/html/installation/docker.html
new file mode 100644
index 0000000..4c228b6
--- /dev/null
+++ b/documentation/html/installation/docker.html
@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+<!--
+ Copyright (c) 2020 fortiss GmbH
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License 2.0 which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ SPDX-License-Identifier: EPL-2.0
+
+ Contributors:
+ Jose Cabral
+ - initial API and implementation and/or initial documentation
+-->
+
+<html lang="en">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+ <title>Building 4diac FORTE docker images</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
+ </head>
+
+ <body>
+ <h1 id="topOfPage">Building 4diac FORTE docker images</h1>
+
+ <p>Two Docker files are provided in the <span class="folderLocation">./docker/</span> folder of the 4diac FORTE repository. The first one is a docker image that runs 4diac FORTE in it. The second one is a docker image that is used to build 4diac FORTE for many architectures and devices. Currently it builds for:
+
+ <ul>
+ <li>linux32</li>
+ <li>raspberry pi (and BeagleBone Black). Not valid for the raspberry pi zero</li>
+ <li>embrick</li>
+ <li>(COMMING SOON) RevPi</li>
+ <li>(COMMING SOON) WAGO</li>
+ </ul>
+
+ <p>In both docker images 4diac FORTE is built with the following modules:</p>
+
+ <ul>
+ <li>UTILS</li>
+ <li>CONVERT</li>
+ <li>IEC61131</li>
+ <li>Arrowhead</li>
+ <li>HTTP (port 8080)</li>
+ <li>LUA</li>
+ <li>MQTT</li>
+ <li>OPC UA (with security)</li>
+ </ul>
+
+ <p>and the devices with their corresponding IO module.</p>
+
+ <p>The docker image of 4diac FORTE has the binary located in <span class="folderLocation">/usr/forte_output/linux32/forte</span></p>
+
+ <p>The builder docker image has the binaries located in <span class="folderLocation">/usr/forte_output/</span></p>
+
+ <p>To build the docker images, you need to go to the root folder of the 4diac FORTE repository and execute (don't forget the point at the end):</p>
+
+
+ <div class="code">docker build -t forte -f docker/Dockerfile_forte .</div>
+
+ <p>and</p>
+
+ <div class="code">docker build -t forte_builder -f docker/Dockerfile_builder .</div>
+
+ <h1>Start containers</h1>
+
+ <p>To start a 4diac FORTE instance, just execute:</p>
+
+ <div class="code">docker run -d -p 61499:61499 -p 4840:4840 forte:latest</div>
+
+ <p>the -d option starts the container in the background. The -p options maps the outside port to the inside. </p>
+
+ <p>To start 4diac FORTE with other listening port, execute:</p>
+
+ <div class="code">docker run -d -p 61500:61500 -p 4840:4840 forte:latest /usr/forte_output/linux32/forte -c localhost:61500</div>
+
+ <p>The most common way of start the forte_builder image is as follow:</p>
+
+ <div class="code">docker run -it forte_builder:latest</div>
+
+ <p>You'll then be inside the container and can browse it.</p>
+
+ <p>To copy the 4diac FORTE binaries to the local folder, execute:</p>
+
+ <div class="code">docker create --name temp_container forte_builder:latest && docker cp temp_container:/usr/forte_output/ ./ && docker rm temp_container</div>
+
+
+
+
+
+ <h1 id="whereToGoFromHere">Where to go from here?</h1>
+
+ <p>Now that you installed the required tools, it's time to start using them. Take a look at the following page:</p>
+
+ <p><a href="../../html/4diacIDE/overview.html">Step by step tutorial</a></p>
+
+ <p>If you want to build a 4diac FORTE, here is a quick link back:</p>
+
+ <p><a href="../../html/installation/install.html">Install Eclipse 4diac</a></p>
+
+ <p>If you want to go back to the Start Here page, we leave you here a fast access</p>
+
+ <p><a href="../../html/startHere/startHere.html">Start Here page</a></p>
+
+ <p class="goToTop">Or <a href="#topOfPage">Go to top</a></p>
+
+</body>
+</html>
+
diff --git a/documentation/html/parameters/parameters.html b/documentation/html/parameters/parameters.html
index 6493b82..0dfc5a8 100644
--- a/documentation/html/parameters/parameters.html
+++ b/documentation/html/parameters/parameters.html
@@ -53,8 +53,7 @@
Boards)</h1>
<p>
- The following picture shows an example application from the <a
- href="../../html/4diacIDE/use4diacLocally.html">Blinking tutorial</a> which
+ The following picture shows an example application from the <a href="../../html/4diacIDE/use4diacLocally.html">Blinking tutorial</a> which
is extended with IX and QX function blocks. The extended application
periodically toggles on pin number 8. It can be started and stopped
via pin number 2. You can connect an LED to obtain a blinking light.
@@ -304,8 +303,8 @@
4diac FORTE to access the I/O of the LMSEV3. Reading this section carefully
without using them could be quite boring and even useless,because the
details will be forgotten if not used. We recommend to give a quick
- reading in order to know what can be accessed using 4diac FORTE. The <a
- href="../../html/examples/pidMotor.html">example</a> presents the
+ reading in order to know what can be accessed using 4diac FORTE.
+ The <a href="../../html/examples/pidMotor.html">example</a> presents the
control of a motor using a PID controller.
</p>
diff --git a/documentation/html/toc.xml b/documentation/html/toc.xml
index 5968ce6..96aabe4 100644
--- a/documentation/html/toc.xml
+++ b/documentation/html/toc.xml
@@ -75,6 +75,8 @@
<topic href="html/installation/cygwin.html" label="Windows - Cygwin compiler"/>
<topic href="html/installation/minGW.html" label="Windows - MinGW-w64 compiler"/>
</topic>
+ <topic href="html/installation/docker.html" label="4diac FORTE as docker">
+ </topic>
</topic>
<!--********************************************************************************************-->
