[pull] master from thiagoralves:master

.gitignore

@@ -5,6 +5,8 @@ public/
 .idea/
 
 *.pyc
+webserver/core/hardware_layer.cpp
+webserver/core/glueVars.cpp
 
 # IDE files for Visual Studio Code and Visual Studio
 CMakeSettings.json
@@ -15,3 +17,8 @@ CMakeSettings.json
 webserver/bin
 webserver/build
 obj/
+utils/dnp3_src/CMakeFiles/
+webserver/scripts/ethercat
+
+# Runtime directories
+.venv

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "utils/ethercat_src"]
+	path = utils/ethercat_src
+	url = https://github.com/r2k-in-the-vortex/ethercat_src.git

Dockerfile

@@ -1,6 +1,30 @@
-FROM debian:bullseye-20211201
+FROM debian:bullseye-20240722
 
 COPY . /workdir
+
 WORKDIR /workdir
-RUN ./install.sh docker
+
+RUN mkdir /persistent
+
+VOLUME /persistent
+
+RUN ./install.sh docker \
+    && touch /persistent/mbconfig.cfg \
+    && touch /persistent/persistent.file \
+    && mkdir /persistent/st_files \
+    && cp /workdir/webserver/openplc.db /persistent/openplc.db \
+    && mv /workdir/webserver/openplc.db /workdir/webserver/openplc_default.db \
+    && cp /workdir/webserver/dnp3.cfg /persistent/dnp3.cfg \
+    && mv /workdir/webserver/dnp3.cfg /workdir/webserver/dnp3_default.cfg \
+    && cp -r /workdir/webserver/st_files/ /persistent/st_files/ \
+    && mv /workdir/webserver/st_files /workdir/webserver/st_files_default \
+    && cp /workdir/webserver/active_program /persistent/active_program \
+    && mv /workdir/webserver/active_program /workdir/webserver/active_program_default \
+    && ln -s /persistent/mbconfig.cfg /workdir/webserver/mbconfig.cfg \
+    && ln -s /persistent/persistent.file /workdir/webserver/persistent.file \
+    && ln -s /persistent/openplc.db /workdir/webserver/openplc.db \
+    && ln -s /persistent/dnp3.cfg /workdir/webserver/dnp3.cfg \
+    && ln -s /persistent/st_files /workdir/webserver/st_files \
+    && ln -s /persistent/active_program /workdir/webserver/active_program
+
 ENTRYPOINT ["./start_openplc.sh"]

README.md

@@ -4,10 +4,10 @@
 [![Build status](https://ci.appveyor.com/api/projects/status/ut3466ixwtyf68qg?svg=true)](https://ci.appveyor.com/project/shrmrf/openplc-v3)
 
 OpenPLC is an open-source [Programmable Logic Controller](https://en.wikipedia.org/wiki/Programmable_logic_controller) that is based on easy to use software. Our focus is to provide a low cost industrial solution for automation and research. OpenPLC has been used in [many research papers](https://scholar.google.com/scholar?as_ylo=2014&q=openplc&hl=en&as_sdt=0,1) as a framework for industrial cyber security research, given that it is the only controller to provide the entire source code.
-The OpenPLC Project consists of three sub-projects:
+The OpenPLC Project consists of two sub-projects:
 1. [Runtime](https://github.com/thiagoralves/OpenPLC_v3)
-2. [Programming editor](http://www.openplcproject.com/plcopen-editor)
-3. [HMI builder](http://www.openplcproject.com/reference-installing-scadabr)
+2. [Programming editor](https://openplcproject.com/docs/installing-openplc-editor/)
+
 
 ## Installation:
 ```bash
@@ -20,7 +20,7 @@ Where `[platform]` can be:
 
 `win` - Install OpenPLC on Windows over Cygwin
 
-`linux` - Install OpenPLC on a Debian-based Linux distribution
+`linux` - Install OpenPLC on a supported Linux distribution, currently Debian-based, Fedora-based, Opensuse and Alpine Linux is supported.
 
 `docker` - Used by the `Dockerfile` (i.e. doesn't invoke `sudo`)
 
@@ -29,7 +29,9 @@ Where `[platform]` can be:
 `custom` - Skip all specific package installation and tries to install OpenPLC assuming your system already has all dependencies met. This option can be useful if you're trying to install OpenPLC on an unsuported Linux platform or had manually installed all the dependency packages before.
 
 ### Building, Installing and Running inside Docker
-Make sure [`docker` is installed](https://docs.docker.com/install/linux/docker-ce/ubuntu/)
+When using Ubuntu: make sure [`docker for Ubuntu` is installed](https://docs.docker.com/install/linux/docker-ce/ubuntu/)
+
+When using Linux Mint 21: make sure [`docker for Linux Mint 21` is installed](https://computingforgeeks.com/install-docker-docker-compose-on-linux-mint/)
 
 #### Build
 ```
@@ -44,3 +46,5 @@ _Devices can be passed to the `docker` daemon using the `-v` flag (e.g. `-v /dev
 docker run -it --rm --privileged -p 8080:8080 openplc:v3
 ```
 
+### EtherCAT capability
+To build with EtherCAT capability try `./install.sh linux ethercat` for more information see `utils/ethercat_src`