Merge pull request #775 from Datasance/iofog/merge

Datasance repo merge

Author: emirhandurmus

.dockerignore

@@ -9,8 +9,12 @@ node_modules
 *.pid
 /src/data/providers/*
 !/src/data/providers/sqlite.js
+!/src/data/providers/mysql.js
+!/src/data/providers/postgres.js
 !/src/data/providers/database-*.js
 /src/config/*-config.json
 .DS_Store
 iofogcontroller-*.tgz
-iofog-iofogcontroller-*.tgz
+iofog-iofogcontroller-*.tgz
+.env
+src/iofog-controller.pid

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,100 +1,93 @@
 name: CI
 on:
-  push: 
+  push:
     branches:
-      - develop
-      - release*
+      - main
     tags: [v*]
     paths-ignore:
       - README.md
       - CHANGELOG.md
       - LICENSE
   pull_request:
-  # Sequence of patterns matched against refs/heads
-    branches:    
-      - develop
-      - release*
+    # Sequence of patterns matched against refs/heads
+    branches:
+      - main
     paths-ignore:
       - README.md
       - CHANGELOG.md
       - LICENSE
-
 env:
-  project: 'focal-freedom-236620'
-  image: 'controller'
+  IMAGE_NAME: 'controller'
+
 
 
 jobs:
   Build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04  
     permissions:
-      contents: 'read'
-      id-token: 'write'
-      packages: 'write'
+      actions: write
+      checks: write
+      contents: write
+      deployments: write
+      id-token: write
+      issues: write
+      discussions: write
+      packages: write
+      pages: write
+      pull-requests: write
+      repository-projects: write
+      security-events: write
+      statuses: write
     name: Preflight
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-node@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
       with:
-        node-version: 18
-    - run: npm ci
+        node-version: 24
+    - name: Replace values
+      shell: bash
+      env: 
+          PAT: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        sed -i.back "s|PAT|${GITHUB_TOKEN}|g" .npmrc
+    - run: npm config set @eclipse-iofog:registry https://npm.pkg.github.com/    
+    - run: npm install --build-from-source --force
     - run: npm run standard
     - run: |
         npm i -g better-npm-audit
         npx better-npm-audit audit -p
 
-  Tests:
-    needs: Build
-    runs-on: ubuntu-latest
+  Publish:
+    needs: [Build]
+    runs-on: ubuntu-22.04
     permissions:
-      contents: 'read'
-      id-token: 'write'
-      packages: 'write'
-      issues: read
+      actions: write
       checks: write
+      contents: write
+      deployments: write
+      id-token: write
+      issues: write
+      discussions: write
+      packages: write
+      pages: write
       pull-requests: write
-    strategy:
-      matrix:
-        node: [ 16, 17, 16, 19 ]
-    name: Node ${{ matrix.node }} Test
-    steps:
-    - uses: actions/checkout@v3
-    - name: Setup Node ${{ matrix.node }} Test
-      uses: actions/setup-node@v3
-      with:
-        node-version: ${{ matrix.node }}
-    - name: Cache Node Modules
-      uses: actions/cache@v3
-      with:
-        path: |
-          node_modules
-        key: ${{ runner.os }}-controller-node_modules-${{ hashFiles('package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-controller-node_modules-
-    - run: npm ci
-    - run: npm run test -- junit
-    - run: npm run postman_test
-    - name: Publish Test Results
-      uses: EnricoMi/publish-unit-test-result-action@v2
-      if: always()
-      with:
-        files: |
-          *-results.xml
-
-  Publish:
-    needs: [Build, Tests]
-    runs-on: ubuntu-latest
-    permissions:
-      contents: 'read'
-      id-token: 'write'
-      packages: 'write'
+      repository-projects: write
+      security-events: write
+      statuses: write 
     name: Publish Controller
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-node@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
       with:
-        node-version: 18
-    - run: npm ci
+        node-version: 24
+    - name: Replace values
+      shell: bash
+      env: 
+          PAT: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        sed -i.back "s|PAT|${PAT}|g" .npmrc
+    - run: npm config set @eclipse-iofog:registry https://npm.pkg.github.com/ 
+    - run: npm install --build-from-source --force
 
     - name: npm version
       id: package-version
@@ -112,47 +105,51 @@ jobs:
 
     - name: npm pack with version from package version
       run: |
-        npm --no-git-tag-version version ${{ steps.version.outputs.pkg_version }}
         npm pack
+        npm publish --registry=https://npm.pkg.github.com/
+
+    - name: 'Get Previous tag'
+      id: previoustag
+      uses: "WyriHaximus/github-action-get-previous-tag@v1"
+      with:
+        fallback: 0.0.0
+    - name: Set image tag
+      shell: bash
+      id: tags
+      run: |
+        if [[ ${{ github.ref_name }} =~ ^v.* ]] ; then
+          VERSION=${{ github.ref_name }}
+          echo "VERSION=${VERSION:1}" >> "${GITHUB_OUTPUT}"
+        else
+            VERSION=${{ steps.previoustag.outputs.tag }}
+            echo "VERSION=${VERSION:1}-${{ github.run_number }}" >> "${GITHUB_OUTPUT}"
+        fi
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+      with:
+        version: v0.29.1      
+
 
     - name: Login to Github Container Registry
       uses: docker/login-action@v2
       with:
         registry: "ghcr.io"
         username: ${{ github.actor }}
-        password: ${{ github.token }}
-
+        password: ${{ secrets.GITHUB_TOKEN }}
+        
     - name: Build and Push to ghcr
       uses: docker/build-push-action@v3
       id: build_push_ghcr
       with:
-        file: Dockerfile.dev
+        file: Dockerfile
+        context: .
+        platforms: linux/amd64, linux/arm64 
         push: true
+        outputs: type=image,name=target,annotation-index.org.opencontainers.image.description=Controller
         tags: |
-          ghcr.io/eclipse-iofog/controller:${{ steps.version.outputs.pkg_version }}
-          ghcr.io/eclipse-iofog/controller:latest
-        build-args: PKG_VERSION=${{ steps.version.outputs.pkg_version }}
-
-    - name: Build and Push to GCR
-      id: build_push_gcr
-      uses: RafikFarhad/push-to-gcr-github-action@v5-beta
-      with:
-        gcloud_service_key: ${{ secrets.GCLOUD_SERVICE_KEY }}
-        registry: gcr.io
-        project_id: ${{ env.project }}
-        image_name: ${{ env.image }}
-        image_tag: latest,${{ steps.version.outputs.pkg_version }}
-        dockerfile: Dockerfile.dev
-        build_args: PKG_VERSION=${{ steps.version.outputs.pkg_version }}
-
-    - run: ls
-
-    - name: Publish package to packagecloud
-      if: ${{ steps.build_push_gcr.outcome }} == 'success'
-      uses: danielmundi/upload-packagecloud@v1
-      with:
-        PACKAGE-NAME: iofog-iofogcontroller-${{ steps.version.outputs.pkg_version }}.tgz
-        PACKAGECLOUD-USERNAME: iofog
-        PACKAGECLOUD-REPO: iofog-controller-snapshots
-        PACKAGECLOUD-DISTRIB: node
-        PACKAGECLOUD-TOKEN: ${{ secrets.packagecloud_token }}
+          ghcr.io/eclipse-iofog/${{ env.IMAGE_NAME }}:${{ steps.tags.outputs.VERSION }}
+          ghcr.io/eclipse-iofog/${{ env.IMAGE_NAME }}:latest
+          ghcr.io/eclipse-iofog/${{ env.IMAGE_NAME }}:main

.github/workflows/ci.yaml

@@ -9,9 +9,14 @@ node_modules
 *.pid
 /src/data/providers/*
 !/src/data/providers/sqlite.js
+!/src/data/providers/mysql.js
+!/src/data/providers/postgres.js
 !/src/data/providers/database-*.js
 /src/config/*-config.json
 .DS_Store
 iofogcontroller-*.tgz
 diagnostic/
-iofog-iofogcontroller-*.tgz
+iofog-iofogcontroller-*.tgz
+.npmrc
+.env
+src/iofog-controller.pid

.gitignore

@@ -0,0 +1,2 @@
+//npm.pkg.github.com/:_authToken=PAT
+@Eclipse-iofog:registry=https://npm.pkg.github.com/

.npmrc

@@ -1,8 +1,5 @@
 {
-  "1091459": {
-    "notes": ""
-  },
-  "1091725": {
+  "1112030": {
     "notes": ""
   }
 }

.nsprc

@@ -0,0 +1 @@
+24

.nvmrc

@@ -0,0 +1,61 @@
+FROM node:24-bookworm AS builder
+
+ARG PKG_VERSION
+# ARG GITHUB_TOKEN
+
+WORKDIR /tmp
+
+RUN npm i -g npm
+
+COPY package.json .
+
+COPY . .
+
+RUN npm i --build-from-source --force
+
+RUN npm version $PKG_VERSION --allow-same-version --no-git-tag-version
+
+RUN npm pack
+
+
+FROM registry.access.redhat.com/ubi9/nodejs-24-minimal:latest
+
+USER root
+# Install dependencies for logging and development
+RUN microdnf install -y g++ make && microdnf clean all
+
+# Install Python and pip
+RUN microdnf install -y python3 && \
+    ln -sf python3 /usr/bin/python && \
+    python3 -m ensurepip && \
+    pip3 install --no-cache --upgrade pip setuptools && \
+    microdnf install shadow-utils && \
+    microdnf clean all
+RUN microdnf install -y tzdata &&  microdnf clean all
+RUN microdnf -y remove microdnf
+RUN useradd --uid 10000 --create-home runner
+RUN mkdir -p /var/log/iofog-controller && \
+    chown runner:runner /var/log/iofog-controller && \
+    chmod 755 /var/log/iofog-controller
+USER 10000
+WORKDIR /home/runner
+
+ENV NPM_CONFIG_PREFIX=/home/runner/.npm-global
+ENV NPM_CONFIG_CACHE=/home/runner/.npm
+ENV PATH=$PATH:/home/runner/.npm-global/bin
+
+COPY --from=builder /tmp/eclipse-iofog-iofogcontroller-*.tgz /home/runner/iofog-controller.tgz
+
+ENV PID_BASE=/home/runner 
+
+RUN npm i -g /home/runner/iofog-controller.tgz && \
+  rm -rf /home/runner/iofog-controller.tgz && \
+  iofog-controller config dev-mode --on
+
+RUN rm -rf /home/runner/.npm-global/lib/node_modules/@eclipse-iofog/iofogcontroller/src/data/sqlite_files/*
+
+COPY LICENSE /licenses/LICENSE
+LABEL org.opencontainers.image.description=controller
+LABEL org.opencontainers.image.source=https://github.com/eclipse-iofog/Controller
+LABEL org.opencontainers.image.licenses=EPL2.0
+CMD [ "node", "/home/runner/.npm-global/lib/node_modules/@eclipse-iofog/iofogcontroller/src/server.js" ]