Skip to content

Commit

Permalink
Merge branch 'main' into BE_develop
Browse files Browse the repository at this point in the history
  • Loading branch information
HABINOH committed Apr 25, 2024
2 parents 9c4164d + e95c5ec commit 53313d8
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 3 deletions.
19 changes: 19 additions & 0 deletions .github/ISSUE_TEMPLATE/issue-template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
name: issue-template
about: Describe this issue template's purpose here.
title: "[BE] Feat: ๊ตฌํ˜„ํ•  ์œ ์ €์Šคํ† ๋ฆฌ ๋‚ด์šฉ"
labels: ''
assignees: ''

---

## โœ’ Description
<!-- ์„ค๋ช…์„ ์ž‘์„ฑํ•ด ์ฃผ์„ธ์š”. -->


## โœ… Todo
- [ ] ๊ตฌํ˜„ ๋‚ด์šฉ 1
- [ ] ๊ตฌํ˜„ ๋‚ด์šฉ 2

## ๐Ÿ“š Etc
<!-- ์ฐธ๊ณ ํ•œ ๋ธ”๋กœ๊ทธ๋‚˜ ๋ฐฐ์šด์  -->
6 changes: 3 additions & 3 deletions backEnd/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ RUN ln -snf /usr/share/zoneinfo/Asia/Seoul /etc/localtime && echo Asia/Seoul > /

# build๊ฐ€ ๋˜๋Š” ์‹œ์ ์— JAR_FILE์ด๋ผ๋Š” ๋ณ€์ˆ˜ ๋ช…์— build/libs/*.jar ์„ ์–ธ
# build/libs - gradle๋กœ ๋นŒ๋“œํ–ˆ์„ ๋•Œ jar ํŒŒ์ผ์ด ์ƒ์„ฑ๋˜๋Š” ๊ฒฝ๋กœ
ARG JAR_FILE=build/libs/ulvan-0.0.1-SNAPSHOT.jar
ARG JAR_FILE=build/libs/ourClass-0.0.1-SNAPSHOT.jar

# JAR_FILE์„ agaproject.jar๋กœ ๋ณต์‚ฌ
COPY ${JAR_FILE} ulvan.jar
COPY ${JAR_FILE} ourClass.jar

# ์šด์˜ ๋ฐ ๊ฐœ๋ฐœ์—์„œ ์‚ฌ์šฉ๋˜๋Š” ํ™˜๊ฒฝ ์„ค์ •์„ ๋ถ„๋ฆฌ
# -Duser.timezone=Asia/Seoul JVM ์˜ต์…˜์„ ์‚ฌ์šฉํ•˜์—ฌ ์• ํ”Œ๋ฆฌ์ผ€์ด์…˜ ์ˆ˜์ค€์—์„œ๋„ ํƒ€์ž„์กด์„ ์„ค์ •
ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=dev", "-Duser.timezone=Asia/Seoul", "/finfarm.jar"]
ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=dev", "-Duser.timezone=Asia/Seoul", "/ourClass.jar"]
1 change: 1 addition & 0 deletions backEnd/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,5 @@ dependencies {

tasks.named('test') {
useJUnitPlatform()
systemProperty 'jasypt.encryptor.key', findProperty("jasypt.encryptor.key")
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.quiz.ourClass.global.server;

import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;

@RestController
public class HealthCheckController {

@GetMapping("/health-check")
public String healthCheck() {
return "OK";
}
}

0 comments on commit 53313d8

Please sign in to comment.