Release/3.5.0

.github/workflows/ci.yml

@@ -19,6 +19,7 @@ on:
 env:
   PROJECT: 'datasance-pot'
   IMAGE_NAME: 'agent'
+  DEBUGGER_IMAGE_NAME: 'node-debugger'
   POTCTL_VERSION: '1.3.4'
   CONTROLLER_IMAGE: 'ghcr.io/datasance/controller:latest'
 
@@ -96,6 +97,19 @@ jobs:
           ghcr.io/datasance/${{ env.IMAGE_NAME }}:latest
           ghcr.io/datasance/${{ env.IMAGE_NAME }}:main
 
+    - name: Build and Push Debugger to ghcr
+
+      uses: docker/build-push-action@v3
+      id: build_push_ghcr_debugger
+      with:
+        file: Dockerfile-debugger
+        platforms: linux/amd64, linux/arm64 
+        push: true
+        tags: |
+          ghcr.io/datasance/${{ env.DEBUGGER_IMAGE_NAME }}:${{ steps.tags.outputs.VERSION }}
+          ghcr.io/datasance/${{ env.DEBUGGER_IMAGE_NAME }}:latest
+          ghcr.io/datasance/${{ env.DEBUGGER_IMAGE_NAME }}:main
+
     - name: Set up Ruby 3.1.4
       uses: ruby/setup-ruby@v1
       with:
@@ -122,18 +136,37 @@ jobs:
       id: create_deb_package
       run: |
         cd packaging/iofog-agent
-        fpm -s dir -d 'openjdk-8-jdk | openjdk-11-jdk | openjdk-17-jdk' -d docker-ce  -t deb -n iofog-agent -v ${{ steps.pkg_version.outputs.version }} -a all --deb-no-default-config-files --after-install debian.sh --after-remove remove.sh --before-upgrade upgrade.sh --after-upgrade debian.sh etc usr
+        fpm -s dir -d 'openjdk-8-jdk | openjdk-11-jdk | openjdk-17-jdk' -d 'docker-ce | podman'  -t deb -n iofog-agent -v ${{ steps.pkg_version.outputs.version }} -a all --deb-no-default-config-files --after-install debian.sh --after-remove remove.sh --before-upgrade upgrade.sh --after-upgrade debian.sh etc usr
         echo "pkg created"
         ls
-    - name: Create rpm package
+
+    # - name: Create deb package for podman
+    #   shell: bash
+    #   id: create_deb_package_podman
+    #   run: |
+    #     cd packaging/iofog-agent
+    #     fpm -s dir -d 'openjdk-8-jdk | openjdk-11-jdk | openjdk-17-jdk' -d 'podman'  -t deb -n iofog-agent-podman -v ${{ steps.pkg_version.outputs.version }} -a all --deb-no-default-config-files --after-install debian.sh --after-remove remove.sh --before-upgrade upgrade.sh --after-upgrade debian.sh etc usr
+    #     echo "pkg created"
+    #     ls
+
+    - name: Create rpm package 
       shell: bash
       id: create_rpm_package
       run: |
         cd packaging/iofog-agent
-        fpm -s dir --depends java-17-openjdk -d docker-ce -t rpm -n iofog-agent -v ${{ steps.pkg_version.outputs.version }} -a all --rpm-os 'linux' --after-install rpm.sh --after-remove remove.sh --before-upgrade upgrade.sh --after-upgrade rpm.sh etc usr;
+        fpm -s dir --depends java-17-openjdk -t rpm -n iofog-agent -v ${{ steps.pkg_version.outputs.version }} -a all --rpm-os 'linux' --after-install rpm.sh --after-remove remove.sh --before-upgrade upgrade.sh --after-upgrade rpm.sh etc usr;
         echo "pkg created"
         ls
 
+    # - name: Create rpm package for podman 
+    #   shell: bash
+    #   id: create_rpm_package_podman
+    #   run: |
+    #     cd packaging/iofog-agent
+    #     fpm -s dir --depends java-17-openjdk -d 'podman' -t rpm -n iofog-agent-podman -v ${{ steps.pkg_version.outputs.version }} -a all --rpm-os 'linux' --after-install rpm.sh --after-remove remove.sh --before-upgrade upgrade.sh --after-upgrade rpm.sh etc usr;
+    #     echo "pkg created"
+    #     ls
+
     - uses: bluwy/substitute-string-action@v1
       id: sub
       with:
@@ -147,7 +180,9 @@ jobs:
       with:
         files: |
           packaging/iofog-agent/iofog-agent_${{ steps.pkg_version.outputs.version }}_all.deb
+          packaging/iofog-agent/iofog-agent-podman_${{ steps.pkg_version.outputs.version }}_all.deb
           packaging/iofog-agent/iofog-agent-${{ steps.pkg_version.outputs.version }}-1.noarch.rpm
+          packaging/iofog-agent/iofog-agent-podman-${{ steps.pkg_version.outputs.version }}-1.noarch.rpm
 
     - uses: actions/checkout@v3
       with:

Dockerfile

@@ -83,6 +83,7 @@ RUN cat iofog-agent.txt iofog-agentd.txt iofog-agentvc.txt | \
 # Create a custom Java runtime
 RUN $JAVA_HOME/bin/jlink \
          --add-modules $(cat modules.txt) \
+         --add-modules jdk.crypto.ec \
          --strip-debug \
          --no-man-pages \
          --no-header-files \
@@ -95,8 +96,8 @@ FROM registry.access.redhat.com/ubi9/ubi-minimal:latest AS ubi-dep
 # Install necessary dependencies
 RUN true && \
     microdnf install -y ca-certificates shadow-utils gzip procps-ng && \
-    microdnf reinstall -y tzdata && \
-    microdnf clean all && \
+    microdnf install -y tzdata && microdnf reinstall -y tzdata\
+    microdnf clean all && \ 
     rm -rf /var/cache/* && \
     true
 
@@ -116,6 +117,7 @@ COPY --from=ubi-dep /usr/bin/gzip /usr/bin/
 COPY --from=ubi-dep /usr/bin/pgrep /usr/bin/
 COPY --from=ubi-dep /usr/bin/awk /usr/bin/
 COPY --from=ubi-dep /etc/ssl/certs/ca-bundle.crt /etc/ssl/certs/
+COPY --from=ubi-dep /etc/pki/tls/certs/ca-bundle.crt /etc/pki/tls/certs/
 
 # Copy required shared libraries for curl grep awk
 COPY --from=ubi-dep /usr/lib64/libc.so.6 /usr/lib64/
@@ -168,7 +170,7 @@ ENV PATH="${JAVA_HOME}/bin:${PATH}"
 COPY --from=jre-build /javaruntime $JAVA_HOME
 
 COPY --from=builder packaging/iofog-agent/usr ./usr
-COPY --from=builder packaging/iofog-agent/etc/init.d /etc/init.d/
+COPY --from=builder packaging/iofog-agent/etc/systemd/system/iofog-agent.service /etc/systemd/system/iofog-agent.service
 COPY --from=builder packaging/iofog-agent/etc/bash_completion.d /etc/bash_completion.d/
 COPY --from=builder packaging/iofog-agent/etc/iofog-agent /etc/iofog-agent/
 
@@ -195,7 +197,7 @@ RUN true && \
     chmod 774 -R /var/run/iofog-agent && \
     chmod 774 -R /var/backups/iofog-agent && \
     chmod 754 -R /usr/share/iofog-agent && \
-    chmod 774 /etc/init.d/iofog-agent && \
+    chmod 774 /etc/systemd/system/iofog-agent.service && \
     chmod 754 /usr/bin/iofog-agent && \
     chown :iofog-agent /usr/bin/iofog-agent && \
     true

Dockerfile-debugger

@@ -0,0 +1,5 @@
+FROM alpine:3.19
+
+RUN apk add --no-cache util-linux
+
+CMD ["/bin/sh", "-c", "nsenter --target 1 --mount --uts --ipc --net -- sleep 14000"]

README.md

@@ -95,11 +95,11 @@ Go to [iofog.org](https://iofog.org/docs/) to learn how to deploy the ioFog Cont
 
  - ioFog Agent Update:
 
-        sudo service iofog-agent stop       
+        sudo systemctl stop iofog-agent       
         sudo apt-get install --only-upgrade iofog-agent
-        sudo service iofog-agent start
+        sudo systemctl start iofog-agent
         or
-        sudo service iofog-agent stop
+        sudo systemctl stop iofog-agent
         sudo apt-get install --only-upgrade iofog-agent-dev (developer's version)
-        sudo service iofog-agent stop        
+        sudo systemctl stop iofog-agent        
 

build.gradle

@@ -1,11 +1,11 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version "8.1.1" apply false
+    id 'com.gradleup.shadow' version '8.3.0' apply false
     id 'java'
 }
 
 allprojects {
     group = 'org.eclipse'
-    version = '3.3.2'
+    version = '3.5.1'
 }
 
 subprojects {

iofog-agent-client/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version '8.1.1'
+    id 'com.gradleup.shadow' version '8.3.0'
 }
 
 description = 'iofog-agent-client'