merge: chore/automatic-cd to develop (#13)

Author: toychip

.github/workflows/cd-app-develop.yml

@@ -0,0 +1,61 @@
+name: Deploy to NCP
+
+on:
+  push:
+    branches:
+      - develop
+
+jobs:
+  build-deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
+        with:
+          java-version: 21
+          distribution: temurin
+
+      - name: Build core-api jar
+        run: ./gradlew :noweekend-core:core-api:clean :noweekend-core:core-api:bootJar
+
+      - name: Build core-api Docker image
+        run: docker build -t core-api:latest -f ./noweekend-core/core-api/Dockerfile ./noweekend-core/core-api
+
+      - name: Save Docker images as tar
+        run: |
+          docker save core-api:latest -o core-api.tar
+          sleep 2
+
+      - name: Fix permissions for all artifacts
+        run: chmod 644 core-api.tar docker-compose.app.yml
+
+      - name: Zip up deploy artifacts
+        run: zip deploy-artifacts.zip core-api.tar docker-compose.app.yml
+
+      - name: SCP zipped artifacts to NCP
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.NCP_SERVER_HOST }}
+          username: root
+          key: ${{ secrets.NCP_SSH_KEY }}
+          source: deploy-artifacts.zip
+          target: /root/organized/app/
+          debug: true
+
+      - name: SSH into server and deploy
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.NCP_SERVER_HOST }}
+          username: root
+          key: ${{ secrets.NCP_SSH_KEY }}
+          script: |
+            cd /root/organized/app
+            rm -f core-api.tar docker-compose.app.yml
+            unzip -o deploy-artifacts.zip
+            rm -f deploy-artifacts.zip
+            docker load -i core-api.tar
+            docker compose -f docker-compose.app.yml up -d

docker-compose.app.yml

@@ -0,0 +1,16 @@
+version: "3.9"
+services:
+  core-api:
+    image: core-api:latest
+    ports:
+      - "8080:8080"
+    environment:
+      JASYPT_ENCRYPTOR_PASSWORD: ${JASYPT_ENCRYPTOR_PASSWORD}
+      SPRING_PROFILES_ACTIVE: staging
+      SERVER_PORT: 8080
+    networks:
+      - mashupnet
+
+networks:
+  mashupnet:
+    external: true

docker-compose.db.yml

@@ -0,0 +1,27 @@
+version: "3.9"
+services:
+  mysql:
+    image: mysql:8.0
+    environment:
+      MYSQL_ROOT_PASSWORD: mash-up-noweekend
+      MYSQL_USER: mash-up-noweekend
+      MYSQL_PASSWORD: mash-up-noweekend
+    ports:
+      - "3306:3306"
+    volumes:
+      - mysql-data:/var/lib/mysql
+    networks:
+      - mashupnet
+
+  redis:
+    image: redis:7.2
+    ports:
+      - "6379:6379"
+    networks:
+      - mashupnet
+volumes:
+  mysql-data:
+
+networks:
+  mashupnet:
+    external: true

noweekend-core/core-api/Dockerfile

@@ -0,0 +1,4 @@
+FROM eclipse-temurin:21-jre
+WORKDIR /app
+COPY build/libs/core-api-*.jar app.jar
+ENTRYPOINT ["java", "-jar", "app.jar"]

noweekend-core/core-api/src/main/resources/application.yml

@@ -12,6 +12,10 @@ spring:
       - domain.yml
   web.resources.add-mappings: false
 
+jasypt:
+  encryptor:
+    password: ${JASYPT_ENCRYPTOR_PASSWORD}
+
 server:
   tomcat:
     max-connections: 20000

noweekend-core/core-domain/build.gradle.kts

@@ -7,9 +7,7 @@ dependencies {
     implementation("org.springframework:spring-tx")
 
     // JWT
-    implementation("io.jsonwebtoken:jjwt-api:0.12.6")
-    implementation("io.jsonwebtoken:jjwt-impl:0.12.6")
-    implementation("io.jsonwebtoken:jjwt-jackson:0.12.6")
+    implementation("io.jsonwebtoken:jjwt-api:0.11.5")
 
     // jasypt
     implementation("com.github.ulisesbocchio:jasypt-spring-boot-starter:3.0.5")

noweekend-mcp/mcp-host/Dockerfile

@@ -0,0 +1,4 @@
+FROM eclipse-temurin:21-jre
+WORKDIR /app
+COPY build/libs/mcp-host-*.jar app.jar
+ENTRYPOINT ["java", "-jar", "app.jar"]

noweekend-mcp/mcp-host/src/main/kotlin/noweekend/mcphost/config/MyAgentState.kt

@@ -3,6 +3,7 @@ package noweekend.mcphost.config
 import org.bsc.langgraph4j.state.AgentState
 import org.bsc.langgraph4j.state.Channel
 import org.bsc.langgraph4j.state.Channels
+import java.util.function.Supplier
 
 class MyAgentState(initData: Map<String, Any>) : AgentState(initData) {
 
@@ -18,9 +19,9 @@ class MyAgentState(initData: Map<String, Any>) : AgentState(initData) {
     companion object {
         @JvmStatic
         val SCHEMA: Map<String, Channel<*>> = mapOf(
-            "question" to Channels.base { "" },
-            "chat_response" to Channels.base { "" },
-            "weather_json" to Channels.base { "" },
+            "question" to Channels.base(Supplier { "" }),
+            "chat_response" to Channels.base(Supplier { "" }),
+            "weather_json" to Channels.base(Supplier { "" }),
         )
     }
 }

noweekend-mcp/mcp-server/Dockerfile

@@ -0,0 +1,4 @@
+FROM eclipse-temurin:21-jre
+WORKDIR /app
+COPY build/libs/mcp-server-*.jar app.jar
+ENTRYPOINT ["java", "-jar", "app.jar"]

noweekend-storage/db-core/src/main/resources/db-core.yml

@@ -24,7 +24,7 @@ storage:
       driver-class-name: com.mysql.cj.jdbc.Driver
       jdbc-url: jdbc:mysql://localhost:3306/noweekend
       username: root
-      password: 12345678
+      password: mash-up-noweekend
       pool-name: core-db-pool
       data-source-properties:
         rewriteBatchedStatements: true
@@ -101,9 +101,9 @@ storage:
   datasource:
     core:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      jdbc-url: jdbc:mysql://${storage.database.core-db.url}
-      username: ${storage.database.core-db.username}
-      password: ${storage.database.core-db.password}
+      jdbc-url: jdbc:mysql://mysql:3306/noweekend
+      username: root
+      password: mash-up-noweekend
       maximum-pool-size: 5
       connection-timeout: 1100
       keepalive-time: 30000