Merge pull request #182 from yudonggeun/chore/cd-actions

[infra] domain 적용 및 ci actions 추가
kSideProject · Jun 18, 2024 · 12f7acf · 12f7acf
2 parents 45630c4 + 3627418
commit 12f7acf
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,26 @@
+name: CI
+
+on:
+  push:
+    branches: [ main ] # push 되었을 때, 실행
+
+jobs:
+  cd:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      # jdk 21 환경 구성
+      - name: set up jdk 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '21'
+
+      # Gradle wrapper 파일 실행 권한주기
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      # Gradle jib를 통한 이미지 배포
+      - name: update image using jib
+        run: ./gradlew --info jib
diff --git a/auth/build.gradle.kts b/auth/build.gradle.kts
@@ -70,7 +70,7 @@ tasks.asciidoctor {
   dependsOn(tasks.test)
 }
 
-val hostname = "152.70.145.249"
+val hostname = "kpring.duckdns.org"
 
 openapi3 {
   setServer("http://$hostname/auth")
@@ -94,7 +94,7 @@ jib {
   to {
     image = "youdong98/kpring-auth-application"
     setAllowInsecureRegistries(true)
-    tags = setOf("latest")
+    tags = setOf("latest", version.toString())
   }
   container {
     jvmFlags = listOf("-Xms512m", "-Xmx512m")

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,6 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.springframework.boot.gradle.tasks.bundling.BootJar
+import java.io.IOException
 
 plugins {
   id("org.springframework.boot") version "3.2.4"
@@ -17,7 +18,7 @@ repositories {
 
 allprojects {
   group = "com.sideproject"
-  version = "0.0.1-SNAPSHOT"
+  version = "git rev-parse --short=8 HEAD".runCommand(workingDir = rootDir)
 
   repositories {
     mavenCentral()
@@ -53,3 +54,25 @@ subprojects {
     debug.set(true)
   }
 }
+
+/**
+ * cli 실행 결과를 반환한기 위한 함수
+ */
+fun String.runCommand(
+  workingDir: File = File("."),
+  timeoutAmount: Long = 60,
+  timeoutUnit: TimeUnit = TimeUnit.SECONDS,
+): String =
+  ProcessBuilder(split("\\s(?=(?:[^'\"`]*(['\"`])[^'\"`]*\\1)*[^'\"`]*$)".toRegex()))
+    .directory(workingDir)
+    .redirectOutput(ProcessBuilder.Redirect.PIPE)
+    .redirectError(ProcessBuilder.Redirect.PIPE)
+    .start()
+    .apply { waitFor(timeoutAmount, timeoutUnit) }
+    .run {
+      val error = errorStream.bufferedReader().readText().trim()
+      if (error.isNotEmpty()) {
+        throw IOException(error)
+      }
+      inputStream.bufferedReader().readText().trim()
+    }
diff --git a/infra/compose.yml b/infra/compose.yml
@@ -10,4 +10,4 @@ services:
     ports:
       - "8080:8080"
     environment:
-      URLS: "[{name: 'auth', url: 'http://152.70.145.249/auth/static/openapi3.yaml'},{name: 'user', url: 'http://152.70.145.249/user/static/openapi3.yaml'}, {name: 'server', url: 'http://152.70.145.249/server/static/openapi3.yaml'}]"
+      URLS: "[{name: 'auth', url: 'http://kpring.duckdns.org/auth/static/openapi3.yaml'},{name: 'user', url: 'http://kpring.duckdns.org/user/static/openapi3.yaml'}, {name: 'server', url: 'http://kpring.duckdns.org/server/static/openapi3.yaml'}]"
diff --git a/server/build.gradle.kts b/server/build.gradle.kts
@@ -67,7 +67,7 @@ kapt {
   annotationProcessor("org.springframework.data.mongodb.repository.support.MongoAnnotationProcessor")
 }
 
-val hostname = "152.70.145.249"
+val hostname = "kpring.duckdns.org"
 
 openapi3 {
   setServer("http://$hostname/server")
@@ -91,7 +91,7 @@ jib {
   to {
     image = "youdong98/kpring-server-application"
     setAllowInsecureRegistries(true)
-    tags = setOf("latest")
+    tags = setOf("latest", version.toString())
   }
   container {
     jvmFlags = listOf("-Xms512m", "-Xmx512m")

diff --git a/server/src/main/kotlin/kpring/server/util/DtoMapper.kt b/server/src/main/kotlin/kpring/server/util/DtoMapper.kt
@@ -5,7 +5,7 @@ import kpring.core.server.dto.ServerThemeInfo
 import kpring.server.domain.Category
 import kpring.server.domain.Theme
 
-fun Category.toInfo(): CategoryInfo  {
+fun Category.toInfo(): CategoryInfo {
   return CategoryInfo(
     id = this.name,
     name = this.toString(),

diff --git a/user/build.gradle.kts b/user/build.gradle.kts
@@ -51,7 +51,7 @@ dependencies {
   implementation("org.springframework.restdocs:spring-restdocs-asciidoctor")
 }
 
-val hostname = "152.70.145.249"
+val hostname = "kpring.duckdns.org"
 
 openapi3 {
   setServer("http://$hostname/user")
@@ -75,7 +75,7 @@ jib {
   to {
     image = "youdong98/kpring-user-application"
     setAllowInsecureRegistries(true)
-    tags = setOf("latest")
+    tags = setOf("latest", version.toString())
   }
   container {
     jvmFlags = listOf("-Xms512m", "-Xmx512m")