Release v0.2.0

Release v0.2.0

Author: CuB1z

.github/workflows/cd-build.yaml

@@ -28,26 +28,28 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+      
+      - name: Compute image name suffix
+        run: |
+          # basename: backend/**-service -> **-service
+          IMAGE_SUFFIX=$(basename "${{ matrix.service }}")
+          # sanitize: to lowercase, replace underscores/slashes with hyphens
+          IMAGE_SUFFIX=$(echo "$IMAGE_SUFFIX" | tr '[:upper:]' '[:lower:]' | tr '_/' '-')
+          echo "IMAGE_SUFFIX=$IMAGE_SUFFIX" >> $GITHUB_ENV
 
       - name: Build and push ${{ matrix.service }}
         uses: docker/build-push-action@v6
         with:
-          context: ./${{ matrix.service }}
+          context: ${{ startsWith(matrix.service, 'frontend') && './frontend' || './backend' }}
           file: ./${{ matrix.service }}/Dockerfile
           push: true
-          tags: docker.io/${{ secrets.DOCKERHUB_USERNAME }}/tripflow-${{ matrix.service }}:${{ inputs.tag }}
-
-      - name: Install ORAS CLI
-        run: |
-          curl -sSL https://github.com/oras-project/oras/releases/download/v1.3.0/oras_1.3.0_linux_amd64.tar.gz \
-            | tar -xz -C /usr/local/bin oras
-          oras version
+          tags: docker.io/${{ secrets.DOCKERHUB_USERNAME }}/tripflow-${{ env.IMAGE_SUFFIX }}:${{ inputs.tag }}
+          build-args: |
+            PUBLIC_API_BASE_URL=${{ secrets.PUBLIC_API_BASE_URL }}
+            PUBLIC_WS_BASE_URL=${{ secrets.PUBLIC_WS_BASE_URL }}
 
       - name: Publish docker-compose as OCI artifact
         if: ${{ matrix.service == fromJSON(inputs.services)[0] }}
         run: |
           cp ${{ inputs.compose_file }} docker-compose.yml
-    
-          oras push docker.io/cub1z/tripflow-compose:${{ inputs.tag }} \
-            --artifact-type application/vnd.docker.compose.v2+yaml \
-            docker-compose.yml:application/vnd.docker.compose.v2+yaml
+          docker compose publish -y ${{ secrets.DOCKERHUB_USERNAME }}/tripflow-compose:${{ inputs.tag }}

.github/workflows/cd-dev.yaml

@@ -11,5 +11,5 @@ jobs:
     with:
       tag: dev
       compose_file: docker/docker-compose.dev.yaml
-      services: '["backend","frontend"]'
+      services: '["backend/api-service","backend/ai-service","backend/notification-service","frontend"]'
     secrets: inherit

.github/workflows/cd-manual.yaml

@@ -33,5 +33,5 @@ jobs:
     with:
       tag: ${{ needs.prepare.outputs.final-tag }}
       compose_file: docker/docker-compose.dev.yaml
-      services: '["backend","frontend"]'
+      services: '["backend/api-service","backend/ai-service","backend/notification-service","frontend"]'
     secrets: inherit

.github/workflows/cd-release.yaml

@@ -10,7 +10,7 @@ jobs:
     with:
       tag: ${{ github.event.release.tag_name }}
       compose_file: docker/docker-compose.yaml
-      services: '["backend","frontend"]'
+      services: '["backend/api-service","backend/ai-service","backend/notification-service","frontend"]'
     secrets: inherit
 
   release-latest:
@@ -19,5 +19,31 @@ jobs:
     with:
       tag: latest
       compose_file: docker/docker-compose.yaml
-      services: '["backend","frontend"]'
+      services: '["backend/api-service","backend/ai-service","backend/notification-service","frontend"]'
     secrets: inherit
+
+  trigger-dokploy:
+    needs: release-latest
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check secrets
+        id: check
+        env:
+          DOKPLOY_URL: ${{ secrets.DOKPLOY_URL }}
+          DOKPLOY_AUTH_TOKEN: ${{ secrets.DOKPLOY_AUTH_TOKEN }}
+          DOKPLOY_COMPOSE_ID: ${{ secrets.DOKPLOY_COMPOSE_ID }}
+        run: |
+          if [[ -n "$DOKPLOY_URL" && -n "$DOKPLOY_AUTH_TOKEN" && -n "$DOKPLOY_COMPOSE_ID" ]]; then
+            echo "configured=true" >> $GITHUB_OUTPUT
+          else
+            echo "configured=false" >> $GITHUB_OUTPUT
+          fi
+      
+      - name: Dokploy Deployment
+        if: steps.check.outputs.configured == 'true'
+        uses: benbristow/dokploy-deploy-action@0.2.2
+        with:
+          api_token: ${{ secrets.DOKPLOY_AUTH_TOKEN }}
+          application_id: ${{ secrets.DOKPLOY_COMPOSE_ID }}
+          dokploy_url: ${{ secrets.DOKPLOY_URL }}
+          service_type: compose

.github/workflows/ci-e2e-tests.yaml

@@ -41,7 +41,7 @@ jobs:
 
       - name: Start services with Docker Compose
         working-directory: ./docker
-        run: docker compose -f docker-compose.test.yaml up -d
+        run: docker compose --env-file .env.example -f docker-compose.test.yaml up -d
 
       - name: Wait for services to be healthy
         working-directory: ./scripts

.github/workflows/ci-generate-api-docs.yaml

@@ -6,7 +6,7 @@ on:
       - main
       - develop
     paths:
-      - 'backend/**'
+      - 'backend/api-service/**'
       - '.github/workflows/ci-generate-api-docs.yaml'
 
   workflow_dispatch:
@@ -22,16 +22,10 @@ jobs:
         uses: docker/setup-compose-action@v1
         with:
           version: latest
-
-      - name: Start services with Docker Compose
-        working-directory: ./docker
-        run: docker compose -f docker-compose.test.yaml up -d
-
-      - name: Wait for services to be healthy
+      
+      - name: Ensure helper scripts are executable
+        run: chmod +x run-wait-for-services.sh
         working-directory: ./scripts
-        run: |
-          chmod +x run-wait-for-services.sh
-          ./run-wait-for-services.sh
 
       - name: Generate API Docs
         working-directory: ./scripts

.github/workflows/ci-integration-tests.yaml

@@ -6,13 +6,13 @@ on:
       - main
       - develop
     paths:
-      - 'backend/**'
+      - 'backend/api-service/**'
       - '.github/workflows/ci-integration-tests.yaml'
   pull_request:
     branches:
       - main
     paths:
-      - 'backend/**'
+      - 'backend/api-service/**'
       - '.github/workflows/ci-integration-tests.yaml'
 
   workflow_dispatch:
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ./backend
+        working-directory: ./backend/
 
     steps:
       - name: Checkout code
@@ -42,8 +42,11 @@ jobs:
           restore-keys: ${{ runner.os }}-m2
 
       - name: Run integration tests
-        run: mvn test -Dgroups=integration
+        run: mvn test -pl ./api-service -am -Dgroups=integration
         env:
           CI: true
           JWT_SECRET: ${{ secrets.JWT_SECRET }}
+          ADMIN_EMAIL: "admin@admin.com"
+          ADMIN_USERNAME: "admin"
+          ADMIN_PASSWORD: "secure_password"
           POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}

.github/workflows/ci-unit-tests.yaml

@@ -24,10 +24,13 @@ on:
 jobs:
   backend-unit-testing:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        service: ["api-service","ai-service","notification-service"]
     defaults:
       run:
         working-directory: ./backend
-        
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -44,9 +47,9 @@ jobs:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('backend/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
-      
-      - name: Run unit tests
-        run: mvn test -Dgroups=unit
+
+      - name: Run unit tests for API Service
+        run: mvn test -pl ./${{ matrix.service }} -am -Dgroups=unit
         env:
           CI: true
           JWT_SECRET: ${{ secrets.JWT_SECRET }}

.gitignore

@@ -1 +1,2 @@
-.vscode/
+.vscode/
+.env

README.md

@@ -14,7 +14,9 @@
 
 ---
 
-![TripFlow Showcase](docs/assets/showcase.png)
+![TripFlow Landing Showcase](docs/assets/showcase.png)
+
+![TripFlow Mobile Showcase](docs/assets/showcase_mobile.png)
 
 ---
 
@@ -36,7 +38,7 @@
 ## 📦 Releases
 
 - [v0.1.0 Release Notes](docs/releases/v0.1.0.md)
-
+- [v0.2.0 Release Notes](docs/releases/v0.2.0.md)
 
 ---