Updated Electros GUI to v3.1.5

.github/workflows/docker-build.yml

@@ -0,0 +1,42 @@
+name: Build and Push Electros docker image
+
+on:
+    push:
+      branches: [ develop ]
+    workflow_dispatch:
+
+permissions:
+    contents: write
+    packages: write
+
+jobs:
+    build-and-push:
+        runs-on: ubuntu-latest
+        steps:
+
+            # build and push the docker image to ghcr.io
+
+            - name: Checkout code
+              uses: actions/checkout@v4
+              with:
+                token: ${{ secrets.CI_TOKEN }}
+                submodules: recursive
+                ref: ${{ github.ref }}
+
+            - name: Populate daemons folder
+              run: |
+                export CI_TOKEN=${{ secrets.CI_TOKEN }}
+                ./populate_daemons.sh --platform linux --arch x64 --develop
+
+            - name: Login to GHCR
+              uses: docker/login-action@v2
+              with:
+                registry: ghcr.io
+                username: ${{ github.actor }}
+                password: ${{ secrets.REPO_KEY }}
+
+            - name: Build and push Docker image
+              run: |
+                OWNER_NAME=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')
+                docker build -f docker/Dockerfile -t ghcr.io/${OWNER_NAME}/elemento-electros-instance:latest .
+                docker push ghcr.io/${OWNER_NAME}/elemento-electros-instance:latest

.gitignore

@@ -3,3 +3,6 @@ electros-daemons
 electros-nwjs/nwjs-sdk-*
 .DS_Store
 electros-electron/venv
+.env
+logs/
+env/

docker/Dockerfile

@@ -0,0 +1,57 @@
+# #******************************************************************************#
+# # Copyright(c) 2019-2023, Elemento srl, All rights reserved                    #
+# # Author: Elemento srl                                                         #
+# # Contributors are mentioned in the code where appropriate.                    #
+# # Permission to use and modify this software and its documentation strictly    #
+# # for personal purposes is hereby granted without fee,                         #
+# # provided that the above copyright notice appears in all copies               #
+# # and that both the copyright notice and this permission notice appear in the  #
+# # supporting documentation.                                                    #
+# # Modifications to this work are allowed for personal use.                     #
+# # Such modifications have to be licensed under a                               #
+# # Creative Commons BY-NC-ND 4.0 International License available at             #
+# # http://creativecommons.org/licenses/by-nc-nd/4.0/ and have to be made        #
+# # available to the Elemento user community                                     #
+# # through the original distribution channels.                                  #
+# # The authors make no claims about the suitability                             #
+# # of this software for any purpose.                                            #
+# # It is provided "as is" without express or implied warranty.                  #
+# #******************************************************************************#
+#
+# #------------------------------------------------------------------------------#
+# #Electros                                                                      #
+# #Authors:                                                                      #
+# #- Filippo Ferrando Damillano (fferrando at elemento.cloud)                    #
+# #------------------------------------------------------------------------------#
+#
+
+
+FROM nginx:trixie
+
+# gather daemons
+# copy app code
+# daemons must run in background - ./daemons
+# entrypoint must run the electros app on port 80
+COPY docker/nginx.conf /etc/nginx/nginx.conf
+COPY electros-daemons/linux/x64/* /opt/daemons/
+COPY elemento-gui-new/ /usr/share/nginx/html/
+COPY elemento-gui-new/electros/configs/atomosFlags.json /usr/share/nginx/html/electros/configs/flags.json
+COPY elemento-gui-new/electros/electrosOnAtomos.html /usr/share/nginx/html/electros/electros.html
+COPY docker/startup.sh /opt/app/startup.sh
+
+RUN chmod +x /opt/daemons/*
+RUN chmod +x /opt/app/startup.sh
+
+RUN mkdir -p /var/log/elemento
+
+RUN ls -lah /usr/share/nginx/html/
+
+EXPOSE 80
+
+ENTRYPOINT [ "/opt/app/startup.sh" ]
+
+
+
+
+
+

docker/arm_Dockerfile

@@ -0,0 +1,57 @@
+# #******************************************************************************#
+# # Copyright(c) 2019-2023, Elemento srl, All rights reserved                    #
+# # Author: Elemento srl                                                         #
+# # Contributors are mentioned in the code where appropriate.                    #
+# # Permission to use and modify this software and its documentation strictly    #
+# # for personal purposes is hereby granted without fee,                         #
+# # provided that the above copyright notice appears in all copies               #
+# # and that both the copyright notice and this permission notice appear in the  #
+# # supporting documentation.                                                    #
+# # Modifications to this work are allowed for personal use.                     #
+# # Such modifications have to be licensed under a                               #
+# # Creative Commons BY-NC-ND 4.0 International License available at             #
+# # http://creativecommons.org/licenses/by-nc-nd/4.0/ and have to be made        #
+# # available to the Elemento user community                                     #
+# # through the original distribution channels.                                  #
+# # The authors make no claims about the suitability                             #
+# # of this software for any purpose.                                            #
+# # It is provided "as is" without express or implied warranty.                  #
+# #******************************************************************************#
+#
+# #------------------------------------------------------------------------------#
+# #Electros                                                                      #
+# #Authors:                                                                      #
+# #- Filippo Ferrando Damillano (fferrando at elemento.cloud)                    #
+# #- Simone Robaldo (srobaldo at elemento.cloud)                                 #
+# #------------------------------------------------------------------------------#
+#
+
+
+FROM nginx:trixie
+
+# gather daemons
+# copy app code
+# daemons must run in background - ./daemons
+# entrypoint must run the electros app on port 80
+COPY ./docker/nginx.conf /etc/nginx/nginx.conf
+COPY electros-daemons/linux/arm64/* /opt/daemons/
+COPY elemento-gui-new/ /usr/share/nginx/html/
+COPY elemento-gui-new/electros/configs/atomosFlags.json /usr/share/nginx/html/electros/configs/flags.json
+COPY ./docker/arm_startup.sh /opt/app/startup.sh
+
+RUN chmod +x /opt/daemons/*
+RUN chmod +x /opt/app/startup.sh
+
+RUN mkdir -p /var/log/elemento
+
+RUN ls -lah /usr/share/nginx/html/
+
+EXPOSE 80
+
+ENTRYPOINT [ "/opt/app/startup.sh" ]
+
+
+
+
+
+

docker/arm_startup.sh

@@ -0,0 +1,37 @@
+#! /bin/bash
+# #******************************************************************************#
+# # Copyright(c) 2019-2023, Elemento srl, All rights reserved                    #
+# # Author: Elemento srl                                                         #
+# # Contributors are mentioned in the code where appropriate.                    #
+# # Permission to use and modify this software and its documentation strictly    #
+# # for personal purposes is hereby granted without fee,                         #
+# # provided that the above copyright notice appears in all copies               #
+# # and that both the copyright notice and this permission notice appear in the  #
+# # supporting documentation.                                                    #
+# # Modifications to this work are allowed for personal use.                     #
+# # Such modifications have to be licensed under a                               #
+# # Creative Commons BY-NC-ND 4.0 International License available at             #
+# # http://creativecommons.org/licenses/by-nc-nd/4.0/ and have to be made        #
+# # available to the Elemento user community                                     #
+# # through the original distribution channels.                                  #
+# # The authors make no claims about the suitability                             #
+# # of this software for any purpose.                                            #
+# # It is provided "as is" without express or implied warranty.                  #
+# #******************************************************************************#
+#
+# #------------------------------------------------------------------------------#
+# #Electros                                                                      #
+# #Authors:                                                                      #
+# #- Filippo Ferrando Damillano (fferrando at elemento.cloud)                    #
+# #- Simone Robaldo (srobaldo at elemento.cloud)                                 #
+# #------------------------------------------------------------------------------#
+#
+
+# start background daemons
+
+#/opt/daemons/Elemento_Daemons_linux_x86 > /var/log/elemento/elemento_daemons.log 2>&1 &
+/opt/daemons/Elemento_Daemons_linux_arm >/var/log/elemento/elemento_daemons.log 2>&1 &
+
+# run the project
+
+nginx -g 'daemon off;'

docker/nginx.conf

@@ -0,0 +1,158 @@
+# #******************************************************************************#
+# # Copyright(c) 2019-2023, Elemento srl, All rights reserved                    #
+# # Author: Elemento srl                                                         #
+# # Contributors are mentioned in the code where appropriate.                    #
+# # Permission to use and modify this software and its documentation strictly    #
+# # for personal purposes is hereby granted without fee,                         #
+# # provided that the above copyright notice appears in all copies               #
+# # and that both the copyright notice and this permission notice appear in the  #
+# # supporting documentation.                                                    #
+# # Modifications to this work are allowed for personal use.                     #
+# # Such modifications have to be licensed under a                               #
+# # Creative Commons BY-NC-ND 4.0 International License available at             #
+# # http://creativecommons.org/licenses/by-nc-nd/4.0/ and have to be made        #
+# # available to the Elemento user community                                     #
+# # through the original distribution channels.                                  #
+# # The authors make no claims about the suitability                             #
+# # of this software for any purpose.                                            #
+# # It is provided "as is" without express or implied warranty.                  #
+# #******************************************************************************#
+#
+# #------------------------------------------------------------------------------#
+# #Electros                                                                      #
+# #Authors:                                                                      #
+# #- Filippo Ferrando Damillano (fferrando at elemento.cloud)                    #
+# #- Simone Robaldo (srobaldo at elemento.cloud)                                 #
+# #------------------------------------------------------------------------------#
+#
+
+
+events {}
+
+http {
+
+    include       /etc/nginx/mime.types;   # important
+    default_type  application/json;
+
+    server {
+        set $authenticate http://127.0.0.1:47777;
+        set $compute    http://127.0.0.1:17777;
+        set $storage    http://127.0.0.1:27777;
+        set $network    http://127.0.0.1:37777;
+        set $services   http://127.0.0.1:6777;
+        set $targets    http://127.0.0.1:57777;
+
+        listen 80;
+
+        root /usr/share/nginx/html;
+        index electros/electros.html;
+
+        location / {
+            try_files $uri $uri/ =404;
+        }
+
+        # Static asset aliases
+        location /js/ {
+            alias /usr/share/nginx/html/electros/js/;
+        }
+
+        location /css/ {
+            alias /usr/share/nginx/html/electros/css/;
+        }
+
+        location /pages/ {
+            alias /usr/share/nginx/html/electros/pages/;
+        }
+
+        location /assets/ {
+            alias /usr/share/nginx/html/electros/assets/;
+        }
+
+        location /Electros.svg {
+            alias /usr/share/nginx/html/electros/Electros.svg;
+        }
+
+        location /configs/ {
+            alias /usr/share/nginx/html/electros/configs/;
+        }
+
+        location /remotes/ {
+            alias /usr/share/nginx/html/electros/remotes/;
+        }
+
+        location /favicon/ {
+            alias /usr/share/nginx/html/electros/favicon/;
+        }
+
+        location /ecd/ {
+            alias /usr/share/nginx/html/electros/ecd/;
+        }
+
+        location /epm/ {
+            alias /usr/share/nginx/html/electros/epm/;
+        }
+
+        location /ist/ {
+            alias /usr/share/nginx/html/electros/ist/;
+        }
+
+        # Daemon statuses handlers
+        location /authStatus {
+            proxy_pass $authenticate/;
+        }
+
+        location /computeStatus {
+            proxy_pass $compute/;
+        }
+
+        location /storageStatus {
+            proxy_pass $storage/;
+        }
+
+        location /networksStatus {
+            proxy_pass $network/;
+        }
+
+        location /servicesStatus {
+            proxy_pass $services/;
+        }
+
+        location /targetsStatus {
+            proxy_pass $targets/;
+        }
+
+        # Daemon handlers
+        location /api/v1/authenticate/ {
+            proxy_pass $authenticate;
+        }
+
+        location /api/v1.0/client/backups/ {
+            proxy_pass $compute;
+        }
+
+        location /api/v1.0/client/vm/ {
+            proxy_pass $compute;
+        }
+
+        # special case for network attach/detach for a VM
+        location ~ ^/api/v1.0/client/network/(attach|detach) {
+            proxy_pass $compute;
+        }
+
+        location /api/v1.0/client/volume/ {
+            proxy_pass $storage;
+        }
+
+        location /api/v1.0/client/network/ {
+            proxy_pass $network;
+        }
+
+        location /api/v1.0/service/ {
+            proxy_pass $services;
+        }
+
+        location /api/v1.0/client/target/ {
+            proxy_pass $targets;
+        }
+    }
+}

docker/startup.sh

@@ -0,0 +1,35 @@
+#! /bin/bash
+# #******************************************************************************#
+# # Copyright(c) 2019-2023, Elemento srl, All rights reserved                    #
+# # Author: Elemento srl                                                         #
+# # Contributors are mentioned in the code where appropriate.                    #
+# # Permission to use and modify this software and its documentation strictly    #
+# # for personal purposes is hereby granted without fee,                         #
+# # provided that the above copyright notice appears in all copies               #
+# # and that both the copyright notice and this permission notice appear in the  #
+# # supporting documentation.                                                    #
+# # Modifications to this work are allowed for personal use.                     #
+# # Such modifications have to be licensed under a                               #
+# # Creative Commons BY-NC-ND 4.0 International License available at             #
+# # http://creativecommons.org/licenses/by-nc-nd/4.0/ and have to be made        #
+# # available to the Elemento user community                                     #
+# # through the original distribution channels.                                  #
+# # The authors make no claims about the suitability                             #
+# # of this software for any purpose.                                            #
+# # It is provided "as is" without express or implied warranty.                  #
+# #******************************************************************************#
+#
+# #------------------------------------------------------------------------------#
+# #Electros                                                                      #
+# #Authors:                                                                      #
+# #- Filippo Ferrando Damillano (fferrando at elemento.cloud)                    #
+# #------------------------------------------------------------------------------#
+#
+# start background daemons
+
+/opt/daemons/Elemento_Daemons_linux_x86 >/var/log/elemento/elemento_daemons.log 2>&1 &
+
+# run the project
+
+nginx -g 'daemon off;'
+