Merge pull request #109 from fledge-iot/3.1.0RC

3.1.0RC

Author: dianomicbot

docker/Dockerfile

@@ -0,0 +1,51 @@
+ARG arch=x86_64
+ARG version=20.04
+FROM --platform=linux/${arch} ubuntu:${version}
+
+LABEL maintainer="[email protected]"
+LABEL org.opencontainers.image.title="Fledge IIoT Platform"
+LABEL org.opencontainers.image.description="Fledge IIoT platform featuring secure execution for a non-root fledge user."
+
+# Define build-time arguments
+ARG arch
+ARG version
+ARG package_version=nightly
+ARG default_packages="fledge fledge-gui"
+ARG packages=""
+ARG USERNAME=fledge
+ARG UID=1001
+ARG GID=1001
+
+# Define environment variables
+ENV FLEDGE_ROOT=/usr/local/fledge \
+    SYSLOG_UDP_ENABLED=True
+
+# Set shell to bash for script compatibility
+SHELL ["/bin/bash", "-c"]
+
+# Copy setup scripts
+COPY setup.sh nginx.conf /tmp/
+
+# fledge packages setup
+RUN set -e && \
+    os_version="ubuntu${version//./}" && \
+    # Append user-supplied packages to default packages
+    if [[ -n "${packages}" ]]; then \
+        all_packages="${default_packages} ${packages}"; \
+    else \
+        all_packages="${default_packages}"; \
+    fi && \
+    /tmp/setup.sh "${USERNAME}" \
+                  "http://archives.fledge-iot.org/${package_version}/${os_version}/${arch}/" \
+                  "${UID}" "${GID}" "${all_packages}" && \
+    rm -f /tmp/setup.sh
+
+# Set user context and working directory
+USER ${UID}:${GID}
+WORKDIR /home/${USERNAME}
+
+# Expose Fledge ports
+EXPOSE 8081 1995 8080 5140
+
+# Default command
+CMD ["bash", "start.sh"]

docker/Dockerfile.ubuntu1804

@@ -1,63 +1,41 @@
-## Installation 
-
-### macOS & Windows
-
-Install Docker CE for Mac and Windows (http://docker.com)
-
-### Ubuntu
-
-To install Docker CE follow the instructions given here:
-
-https://docs.docker.com/engine/installation/linux/docker-ce/ubuntu/
-
-### Red Hat Enterprise Linux (RHEL)
+### Build Fledge image
 
 ```
-	sudo yum install yum-utils
-	sudo yum-config-manager --enable rhui-REGION-rhel-server-extras
-	sudo yum install docker
-	sudo systemctl daemon-reload
-	sudo systemctl restart docker
+    $ docker build --no-cache --tag fledge:latest-ubuntu2004 -f Dockerfile .
 ```
-### Build fledge image
+
+Default will be built with the latest stable release.
 
 ```
-    $ docker build --tag fledge:dev --build-arg FLEDGE_BRANCH=develop -f Dockerfile.ubuntu1804 .
+    $ docker build --tag fledge:nightly-ubuntu2004-aarch64 --build-arg version=20.04 --build-arg arch=aarch64 --build-arg package_version=nightly --build-arg packages="fledge-south-lathe fledge-south-sinusoid fledge-north-http-north" -f Dockerfile .
 ```
 
-where name of the image is fledge, FLEDGE_BRANCH is the branch to build (develop, main, 1.5.2 ,etc)
+The image is referred to as fledge, and it is tagged as nightly-ubuntu2004-aarch64. The package_version denotes the version of the packages, such as latest, nightly, fixes/FOGL-XXXX.
 
-### Run container
+##### Build Arguments:
 
+a) **version** - The name of the Ubuntu version is either 18.04 or 20.04. By default, the version is 20.04.
 
-```
-    $ docker run -d -v ~/fledge-data:/usr/local/fledge/data --name fledge -p 8081:8081 -p 1995:1995 -p 8082:80 fledge:dev
-```
+b) **arch** - The Ubuntu architecture is designated as either x86_64 or aarch64. The default architecture is x86_64.
 
-	-d : run fledge container in detached mode
-	-v : maps host volume /fledge-data to container volume /usr/local/fledge/data
-	--name : name of the container (fledge)
-	-p : map the port of host machine (8081) and container (:8081)
-	fledge : name of the image created in earlier step
+c) **package_version** - The package version can be either the latest, nightly, or fixes/FOGL-XXXX. By default, it is set to nightly.
+
+d) **packages** - A compilation of packages delineated by spaces. For instance, packages="fledge-south-lathesim fledge-south-sinusoid fledge-north-http-north".
+
+e) **USERNAME** - Name of the non-root user. By default, it is fledge.
 
-> To attach to a running conatiner: `docker exec -it fledge bash`
 
-`--network host` mode makes the container use the host's network stack.
+### Run container
+
 
-### Stopping docker container
 ```
-    $ docker stop fledge
+    $ docker run -d --name fledge -p 8081:8081 -p 1995:1995 -p 8082:80 fledge:nightly-ubuntu2004-aarch64
 ```
 
-> Note: The files in fledge-data directory are created by container which creates/runs them as root user. In order to read the fledge.db, you need to change the permission of fledge.db* files, sudo chmod 666 fledge.db*
-
-### notes...
+	-d : run fledge container in detached mode
+	-p : map the ports, e.g host machine (8081) to container (:8081)
 
-docker save -o fledge-dev.tar fledge:dev
 
+To attach to a running container: `docker exec -it fledge bash`
 
-docker load < fledge-dev.tar.gz
-docker load --input fledge-dev.tar.gz
 
-docker run -d -v ~/fledge-data:/usr/local/fledge/data --name fledge -p 8081:8081 -p 1995:1995 -p 8082:80 fledge:dev
-docker run -d --name fledge -p 8081:8081 -p 1995:1995 -p 8082:80 fledge:dev

docker/Dockerfile.ubuntu2004

@@ -0,0 +1,54 @@
+# Use a system-level or least-privileged user
+user fledge;
+
+# Specify where to store the PID
+pid /tmp/nginx.pid;
+
+# Tune worker processes (usually equal to CPU cores)
+worker_processes auto;
+
+events {
+    worker_connections 1024;
+    # Consider enabling multi_accept for high-load scenarios
+    # multi_accept on;
+}
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    # Enable access and error logs (adjust paths as needed)
+    access_log  /var/log/nginx/access.log;
+    error_log   /var/log/nginx/error.log warn;
+
+    # Optimize file transfer and reduce latency
+    sendfile        on;
+    tcp_nopush      on;
+    tcp_nodelay     on;
+
+    keepalive_timeout  65;
+
+    # Gzip compression for better performance
+    gzip on;
+    gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
+
+    server {
+        listen       80 default_server;
+        server_name  localhost;
+
+        root         /var/www/html;
+        index        fledge.html;
+
+        location / {
+            try_files $uri $uri/ =404;
+        }
+
+        # Optional: custom error pages
+        error_page 404 /404.html;
+        error_page 500 502 503 504 /50x.html;
+
+        location = /50x.html {
+            root /usr/share/nginx/html;
+        }
+    }
+}