From 8918f0fd641fb155257c09350783bbd5a7fc8607 Mon Sep 17 00:00:00 2001
From: sysnaptik-main <sysnaptik-main@local>
Date: Thu, 25 Jun 2026 15:02:22 +0000
Subject: [PATCH] fix workflow and deployment

---
 .gitea/workflows/mindflux.yml | 40 +++++++++++++++++++++++++++++------
 Dockerfile                    | 12 +++++------
 docker-compose.yml            |  3 +++
 3 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/.gitea/workflows/mindflux.yml b/.gitea/workflows/mindflux.yml
index 2a43ef1..c6900bb 100644
--- a/.gitea/workflows/mindflux.yml
+++ b/.gitea/workflows/mindflux.yml
@@ -2,21 +2,49 @@ name: mindflux-ci
 
 on:
   push:
-    branches: ["main"]
+    branches: [ "main" ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
-    container:
-      image: maven:3.9-eclipse-temurin-21
-
     steps:
       - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          path: .
+
+      - name: Debug workspace
         run: |
           pwd
           ls -la
+          find . -name pom.xml
 
-      - name: Build with Maven
+      - name: Setup Java 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 21
+
+      - name: Build Maven
         run: |
-          mvn -B clean package -DskipTests
+          pwd
+          ls -la
+          mvn clean package -DskipTests
+
+      - name: Docker build
+        run: docker build -t registry:5000/mindflux:latest .
+
+      - name: Push image
+        run: docker push registry:5000/mindflux:latest
+
+      - name: Setup SSH
+        run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_ed25519
+          chmod 600 ~/.ssh/id_ed25519
+          ssh-keyscan -H 167.233.81.134 >> ~/.ssh/known_hosts
+
+      - name: Deploy
+        run: |
+          ssh ci-deploy@167.233.81.134  "/srv/sysnaptik/deploy-mindflux.sh"
diff --git a/Dockerfile b/Dockerfile
index 8af54fb..4c84d63 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM maven:3.9.8-eclipse-temurin-21 AS build
+# ---- Build Stage ----
+FROM eclipse-temurin:21-jdk AS build
 
 WORKDIR /app
 
-COPY pom.xml .
-RUN mvn dependency:go-offline
+COPY . .
 
-COPY src ./src
-RUN mvn clean package -DskipTests
+RUN ./mvnw clean package -DskipTests || mvn clean package -DskipTests
 
 
+# ---- Runtime Stage ----
 FROM eclipse-temurin:21-jdk
 
 WORKDIR /app
@@ -17,4 +17,4 @@ COPY --from=build /app/target/*.jar app.jar
 
 EXPOSE 8080
 
-CMD ["java", "-jar", "app.jar"]
+ENTRYPOINT ["java","-jar","app.jar"]
diff --git a/docker-compose.yml b/docker-compose.yml
index f10bc06..e24783a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,12 +3,15 @@ services:
     image: registry:5000/mindflux:latest
     container_name: mindflux
     restart: unless-stopped
+
     environment:
       SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/mindfluxdb
       SPRING_DATASOURCE_USERNAME: mindflux
       SPRING_DATASOURCE_PASSWORD: mindflux_pass
+
     networks:
       - backend_network
+
     ports:
       - "8081:8080"