From 1844e13eb7812f6e1e6ece9b1537a37533559e7f Mon Sep 17 00:00:00 2001
From: 20210699 <20210699@duksung.ac.kr>
Date: Tue, 27 Aug 2024 02:09:56 +0900
Subject: [PATCH 01/13] =?UTF-8?q?[Feat]=20Ci=20=EA=B5=AC=EC=B6=95=20?=
 =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/dev_deploy.yml | 168 +++++++++++++++++++++----------
 Dockerfile                       |   9 ++
 build.gradle                     |   6 ++
 3 files changed, 132 insertions(+), 51 deletions(-)
 create mode 100644 Dockerfile

diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml
index 5e75b52..6fca4b7 100644
--- a/.github/workflows/dev_deploy.yml
+++ b/.github/workflows/dev_deploy.yml
@@ -1,63 +1,129 @@
+#name: Maeummal CI/CD
+#
+#on:
+#  pull_request:
+#    types: [closed] # pull request 가 닫히면 즉, 머지가 됐을 때 돌아라!
+#  workflow_dispatch: # (2).수동 실행도 가능하도록
+#
+#jobs:
+#  build:
+#    runs-on: ubuntu-latest # (3).OS환경 / 우분투 기반
+#    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'develop'
+#    # 머지가 되었는데, 머지가 된 대상이 'develop' 브랜치이면 돌아라!
+#
+#    steps:
+#      - name: Checkout # 코드를 가져오는 것. 빌드를 할 코드를 가져오는 것. ( 이름은 본인이 지정 )
+#        uses: actions/checkout@v2 # (4).코드 check out
+#        # 리포지터리 최상단부터 체크 아웃 함
+#
+#      - name: Set up JDK 17
+#        uses: actions/setup-java@v3
+#        with:
+#          java-version: 17 # (5).자바 설치
+#          distribution: 'adopt'
+#
+#      - name: Grant execute permission for gradlew
+#        run: chmod +x ./gradlew
+#        shell: bash # (6).권한 부여
+#
+#      - name: Build with Gradle
+#        run: ./gradlew clean build -x test # gradlew에 권한 줌
+#        shell: bash # (7).build 시작
+#
+#      - name: Get current time
+#        uses: 1466587594/get-current-time@v2
+#        id: current-time
+#        with:
+#          format: YYYY-MM-DDTHH-mm-ss
+#          utcOffset: "+09:00" # (8).build 시점의 시간확보
+#
+#      - name: Show Current Time
+#        run: echo "CurrentTime=$"
+#        shell: bash # (9).확보한 시간 보여주기
+#
+#      - name: Generate deployment package # 빌드하는 과정
+#        run: |
+#          mkdir -p deploy
+#          cp build/libs/*.jar deploy/application.jar
+#          cp Procfile deploy/Procfile
+#          cp -r .ebextensions_dev deploy/.ebextensions
+#          cp -r .platform deploy/.platform
+#          cd deploy && zip -r deploy.zip .
+#
+#      - name: Beanstalk Deploy
+#        uses: einaregilsson/beanstalk-deploy@v20
+#        with:
+#          aws_access_key: ${{ secrets.AWS_ACTION_ACCESS_KEY_ID }}
+#          aws_secret_key: ${{ secrets.AWS_ACTION_SECRET_ACCESS_KEY }}
+#          application_name: maeummal-dev # 프로젝트명
+#          environment_name: Maeummal-dev-env # 프로젝트명
+#          version_label: github-action-${{ steps.current-time.outputs.formattedTime }}
+#          region: ap-northeast-2
+#          deployment_package: deploy/deploy.zip
+#          wait_for_deployment: false
+
+#name: Java CI with Gradle
+#
+#on:
+#  push:
+#    branches: develop
+#  pull_request:
+#    branches: develop
+#
+#jobs:
+#  build:
+#
+#    runs-on: ubuntu-latest
+#
+#    steps:
+#      - uses: actions/checkout@v2
+#      - name: Set up JDK 11
+#        uses: actions/setup-java@v2
+#        with:
+#          java-version: '11'
+#          distribution: 'adopt'
+#      - name: Grant execute permission for gradlew
+#        run: chmod +x gradlew
+#      - name: Build with Gradle
+#        run: ./gradlew build
+#      - name: Docker build
+#        run: |
+#          docker login -u ${{ secrets.USERNAME }} -p ${{ secrets.PASSWORD }}
+#          docker build -t maeummal-cicd .
+#          docker tag maeummal-cicd maeummal/maeummal-cicd:${GITHUB_SHA::7}
+#          docker push maeummal/maeummal-cicd:${GITHUB_SHA::7}
+
 name: Maeummal CI/CD
 
 on:
+  push:
+    branches: [ "develop" ]
   pull_request:
-    types: [closed] # pull request 가 닫히면 즉, 머지가 됐을 때 돌아라!
-  workflow_dispatch: # (2).수동 실행도 가능하도록
+    branches: [ "develop" ]
 
 jobs:
-  build:
-    runs-on: ubuntu-latest # (3).OS환경 / 우분투 기반
-    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'develop'
-    # 머지가 되었는데, 머지가 된 대상이 'develop' 브랜치이면 돌아라!
+  deploy:
+    runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout # 코드를 가져오는 것. 빌드를 할 코드를 가져오는 것. ( 이름은 본인이 지정 )
-        uses: actions/checkout@v2 # (4).코드 check out
-        # 리포지터리 최상단부터 체크 아웃 함
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: 17 # (5).자바 설치
-          distribution: 'adopt'
+      - name: Checkout
+        uses: actions/checkout@v2
 
-      - name: Grant execute permission for gradlew
-        run: chmod +x ./gradlew
-        shell: bash # (6).권한 부여
+      # Spring Boot 어플리케이션 Build (1)
+      - name: Spring Boot Build
+        run: ./gradlew clean build --exclude-task test
 
-      - name: Build with Gradle
-        run: ./gradlew clean build -x test # gradlew에 권한 줌
-        shell: bash # (7).build 시작
+      # Docker 이미지 Build (2)
+      - name: docker image build
+        run: docker build -t maeummal/maeummal-cicd .
 
-      - name: Get current time
-        uses: 1466587594/get-current-time@v2
-        id: current-time
-        with:
-          format: YYYY-MM-DDTHH-mm-ss
-          utcOffset: "+09:00" # (8).build 시점의 시간확보
-
-      - name: Show Current Time
-        run: echo "CurrentTime=$"
-        shell: bash # (9).확보한 시간 보여주기
-
-      - name: Generate deployment package # 빌드하는 과정
-        run: |
-          mkdir -p deploy 
-          cp build/libs/*.jar deploy/application.jar
-          cp Procfile deploy/Procfile
-          cp -r .ebextensions_dev deploy/.ebextensions
-          cp -r .platform deploy/.platform
-          cd deploy && zip -r deploy.zip .
-
-      - name: Beanstalk Deploy
-        uses: einaregilsson/beanstalk-deploy@v20
+      # DockerHub Login (3)
+      - name: docker login
+        uses: docker/login-action@v2
         with:
-          aws_access_key: ${{ secrets.AWS_ACTION_ACCESS_KEY_ID }}
-          aws_secret_key: ${{ secrets.AWS_ACTION_SECRET_ACCESS_KEY }}
-          application_name: maeummal-dev # 프로젝트명
-          environment_name: Maeummal-dev-env # 프로젝트명
-          version_label: github-action-${{ steps.current-time.outputs.formattedTime }}
-          region: ap-northeast-2
-          deployment_package: deploy/deploy.zip
-          wait_for_deployment: false
\ No newline at end of file
+          username: ${{ secrets.USERNAME }}
+          password: ${{ secrets.PASSWORD }}
+
+      # Docker Hub push (4)
+      - name: docker Hub push
+        run: docker push maeummal/maeummal-cicd
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..975f5f9
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,9 @@
+#FROM ubuntu:latest
+#LABEL authors="solor"
+#
+#ENTRYPOINT ["top", "-b"]
+
+FROM openjdk:17-slim
+ARG JAR_FILE=build/libs/*.jar
+COPY ${JAR_FILE} app.jar
+ENTRYPOINT ["java","-jar","/app.jar"]
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 48577e5..4e2779e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -100,4 +100,10 @@ tasks.named('test') {
 }
 jar { // ci set
     enabled = false
+}
+
+bootJar{ // 프로젝트 빌드 파일명 설정
+    archivesBaseName = 'maeummal'
+    archiveFileName = 'maeummal.jar'
+    archiveVersion = "0.0.0"
 }
\ No newline at end of file

From d358cc6243acc80a83ff3b9dfcdbe1ecbe85fb23 Mon Sep 17 00:00:00 2001
From: 20210699 <20210699@duksung.ac.kr>
Date: Tue, 27 Aug 2024 02:13:37 +0900
Subject: [PATCH 02/13] [Feat] CI test 2

---
 .github/workflows/dev_deploy.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml
index 6fca4b7..9bc843c 100644
--- a/.github/workflows/dev_deploy.yml
+++ b/.github/workflows/dev_deploy.yml
@@ -109,6 +109,12 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
+      # Java 17 설정 (추가)
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          java-version: '17'
+
       # Spring Boot 어플리케이션 Build (1)
       - name: Spring Boot Build
         run: ./gradlew clean build --exclude-task test
@@ -126,4 +132,4 @@ jobs:
 
       # Docker Hub push (4)
       - name: docker Hub push
-        run: docker push maeummal/maeummal-cicd
\ No newline at end of file
+        run: docker push maeummal/maeummal-cicd

From 69072ebf7d9a6f49c78dd783b56c25c5b4a0bbf7 Mon Sep 17 00:00:00 2001
From: 20210699 <20210699@duksung.ac.kr>
Date: Tue, 27 Aug 2024 02:15:51 +0900
Subject: [PATCH 03/13] [Feat] CI test 3

---
 .github/workflows/dev_deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml
index 9bc843c..280bff4 100644
--- a/.github/workflows/dev_deploy.yml
+++ b/.github/workflows/dev_deploy.yml
@@ -109,11 +109,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      # Java 17 설정 (추가)
       - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
           java-version: '17'
+          distribution: 'temurin'
 
       # Spring Boot 어플리케이션 Build (1)
       - name: Spring Boot Build

From 254391a2f72925b00b44589d986ef6aeb7488d47 Mon Sep 17 00:00:00 2001
From: 20210699 <20210699@duksung.ac.kr>
Date: Tue, 27 Aug 2024 02:29:46 +0900
Subject: [PATCH 04/13] [Feat] CI test 4

---
 .github/workflows/dev_deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml
index 280bff4..0ae0340 100644
--- a/.github/workflows/dev_deploy.yml
+++ b/.github/workflows/dev_deploy.yml
@@ -127,8 +127,8 @@ jobs:
       - name: docker login
         uses: docker/login-action@v2
         with:
-          username: ${{ secrets.USERNAME }}
-          password: ${{ secrets.PASSWORD }}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       # Docker Hub push (4)
       - name: docker Hub push

From 648bea43f64a5e3c6434cf34d9e4920a7e3f5f72 Mon Sep 17 00:00:00 2001
From: 20210699 <20210699@duksung.ac.kr>
Date: Tue, 27 Aug 2024 12:17:29 +0900
Subject: [PATCH 05/13] =?UTF-8?q?[Fix]=20Bean=20=EC=B6=A9=EB=8F=8C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../prep/prep1/config/ChatGPTConfig.java      | 42 -------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 src/main/java/com/vlc/maeummal/domain/prep/prep1/config/ChatGPTConfig.java

diff --git a/src/main/java/com/vlc/maeummal/domain/prep/prep1/config/ChatGPTConfig.java b/src/main/java/com/vlc/maeummal/domain/prep/prep1/config/ChatGPTConfig.java
deleted file mode 100644
index 2d390bb..0000000
--- a/src/main/java/com/vlc/maeummal/domain/prep/prep1/config/ChatGPTConfig.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.vlc.maeummal.domain.prep.prep1.config;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.web.client.RestTemplate;
-
-/**
- * ChatGPT에서 사용하는 환경 구성
- *
- * @author : yu
- * @fileName : RestTemplate
- * @since : 07/17/24
- */
-@Configuration
-public class ChatGPTConfig {
-
-    @Value("${openai.api.key}")
-    private String secretKey;
-
-    @Bean
-    public RestTemplate restTemplate() {
-        RestTemplate template = new RestTemplate();
-        template.getInterceptors().add((request, body, execution) -> {
-            request.getHeaders().add(
-                    "Authorization"
-                    ,"Bearer "+secretKey);
-            return execution.execute(request,body);
-        });
-        return template;
-    }
-
-//    @Bean
-//    public HttpHeaders httpHeaders() {
-//        HttpHeaders headers = new HttpHeaders();
-//        headers.set("Authorization", "Bearer " + secretKey);
-//        headers.setContentType(MediaType.APPLICATION_JSON);
-//        return headers;
-//    }
-}
\ No newline at end of file

From a3459446ad7b853af7b86be5158fe212ab669532 Mon Sep 17 00:00:00 2001
From: 20210699 <20210699@duksung.ac.kr>
Date: Tue, 27 Aug 2024 23:53:11 +0900
Subject: [PATCH 06/13] [Feat] CI test 5

---
 .github/workflows/dev_deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml
index 0ae0340..8368898 100644
--- a/.github/workflows/dev_deploy.yml
+++ b/.github/workflows/dev_deploy.yml
@@ -121,7 +121,7 @@ jobs:
 
       # Docker 이미지 Build (2)
       - name: docker image build
-        run: docker build -t maeummal/maeummal-cicd .
+        run: docker build -t maeummal/maeummal-cicd:${{ github.sha }} .
 
       # DockerHub Login (3)
       - name: docker login
@@ -132,4 +132,4 @@ jobs:
 
       # Docker Hub push (4)
       - name: docker Hub push
-        run: docker push maeummal/maeummal-cicd
+        run: docker push maeummal/maeummal-cicd:${{ github.sha }}

From 26d9e7b51f29979dee82ed332ce807888ff7fb41 Mon Sep 17 00:00:00 2001
From: 20210699 <20210699@duksung.ac.kr>
Date: Wed, 28 Aug 2024 00:19:22 +0900
Subject: [PATCH 07/13] [Feat] CI test 6

---
 .../java/com/vlc/maeummal/domain/word/service/WordService.java | 1 -
 src/main/java/com/vlc/maeummal/global/aws/AmazonS3Manager.java | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/com/vlc/maeummal/domain/word/service/WordService.java b/src/main/java/com/vlc/maeummal/domain/word/service/WordService.java
index e86e403..4fb8d7b 100644
--- a/src/main/java/com/vlc/maeummal/domain/word/service/WordService.java
+++ b/src/main/java/com/vlc/maeummal/domain/word/service/WordService.java
@@ -38,7 +38,6 @@ public class WordService {
 
     private final UuidRepository uuidRepository;
 
-    private final WordRepository wordRepository;
     private final UserAuthorizationConverter userAuthorizationConverter;
     private final ChallengeService challengeService;
 
diff --git a/src/main/java/com/vlc/maeummal/global/aws/AmazonS3Manager.java b/src/main/java/com/vlc/maeummal/global/aws/AmazonS3Manager.java
index fac5472..b953f33 100644
--- a/src/main/java/com/vlc/maeummal/global/aws/AmazonS3Manager.java
+++ b/src/main/java/com/vlc/maeummal/global/aws/AmazonS3Manager.java
@@ -25,6 +25,7 @@
 @Component
 @RequiredArgsConstructor
 public class AmazonS3Manager{
+
     @Value("${cloud.aws.s3.bucket}")
     private String bucket;
 
@@ -32,8 +33,6 @@ public class AmazonS3Manager{
 
     private final AmazonConfig amazonConfig;
 
-    private final UuidRepository uuidRepository;
-
 
     public String uploadFileWithoutImg(String keyName, MultipartFile file){
         ObjectMetadata metadata = new ObjectMetadata();

From f102a8d13a725d0b033e38631edbc73909d52d19 Mon Sep 17 00:00:00 2001
From: 20210699 <20210699@duksung.ac.kr>
Date: Wed, 28 Aug 2024 00:41:36 +0900
Subject: [PATCH 08/13] [Feat] CI test 7

---
 .../maeummal/global/aws/AmazonS3Manager.java  |  3 +-
 .../maeummal/global/config/AmazonConfig.java  | 57 ++++++++++++++++---
 2 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/vlc/maeummal/global/aws/AmazonS3Manager.java b/src/main/java/com/vlc/maeummal/global/aws/AmazonS3Manager.java
index b953f33..fac5472 100644
--- a/src/main/java/com/vlc/maeummal/global/aws/AmazonS3Manager.java
+++ b/src/main/java/com/vlc/maeummal/global/aws/AmazonS3Manager.java
@@ -25,7 +25,6 @@
 @Component
 @RequiredArgsConstructor
 public class AmazonS3Manager{
-
     @Value("${cloud.aws.s3.bucket}")
     private String bucket;
 
@@ -33,6 +32,8 @@ public class AmazonS3Manager{
 
     private final AmazonConfig amazonConfig;
 
+    private final UuidRepository uuidRepository;
+
 
     public String uploadFileWithoutImg(String keyName, MultipartFile file){
         ObjectMetadata metadata = new ObjectMetadata();
diff --git a/src/main/java/com/vlc/maeummal/global/config/AmazonConfig.java b/src/main/java/com/vlc/maeummal/global/config/AmazonConfig.java
index 1439224..1a47ad9 100644
--- a/src/main/java/com/vlc/maeummal/global/config/AmazonConfig.java
+++ b/src/main/java/com/vlc/maeummal/global/config/AmazonConfig.java
@@ -1,5 +1,5 @@
 package com.vlc.maeummal.global.config;
-
+/*
 import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.auth.AWSCredentialsProvider;
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
@@ -18,24 +18,26 @@ public class AmazonConfig {
 
     private AWSCredentials awsCredentials;
 
-    @Value(("${cloud.aws.credentials.accessKey}"))
+    @Value("${cloud.aws.credentials.accessKey}")
     private String accessKey;
 
-    @Value(("${cloud.aws.credentials.secretKey}"))
+    @Value("${cloud.aws.credentials.secretKey}")
     private String secretKey;
 
-    @Value(("${cloud.aws.region.static}"))
+    @Value("${cloud.aws.region.static}")
     private String region;
 
-    @Value(("${cloud.aws.s3.bucket}"))
+    @Value("${cloud.aws.s3.bucket}")
     private String bucket;
 
     @Value("${cloud.aws.s3.path.words}")
     private String wordPath;
 
-    @PostConstruct
+   */
+/* @PostConstruct
     public void init() {
-        this.awsCredentials = new BasicAWSCredentials(accessKey, secretKey); }
+        this.awsCredentials = new BasicAWSCredentials(accessKey, secretKey); }*//*
+
     @Bean
     public AmazonS3 amazonS3() {
         AWSCredentials credentials
@@ -51,3 +53,44 @@ public AWSCredentialsProvider awsCredentialsProvider() {
         return new AWSStaticCredentialsProvider(awsCredentials);
     }
 }
+*/
+
+import com.amazonaws.auth.AWSCredentials;
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
+import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.AmazonS3ClientBuilder;
+import lombok.Getter;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@Getter
+public class AmazonConfig {
+
+    @Value("${cloud.aws.credentials.accessKey}")
+    private String accessKey;
+
+    @Value("${cloud.aws.credentials.secretKey}")
+    private String secretKey;
+
+    @Value("${cloud.aws.region.static}")
+    private String region;
+
+    @Value("${cloud.aws.s3.bucket}")
+    private String bucket;
+
+    @Value("${cloud.aws.s3.path.words}")
+    private String wordPath;
+
+    @Bean
+    public AmazonS3 amazonS3() {
+        AWSCredentials credentials = new BasicAWSCredentials(accessKey, secretKey);
+        return AmazonS3ClientBuilder.standard()
+                .withRegion(region)
+                .withCredentials(new AWSStaticCredentialsProvider(credentials))
+                .build();
+    }
+}

From 9748ec47f24cc978b44da08f438d0104273d8299 Mon Sep 17 00:00:00 2001
From: 20210699 <20210699@duksung.ac.kr>
Date: Wed, 28 Aug 2024 02:04:19 +0900
Subject: [PATCH 09/13] [Feat] CI test 7

---
 Dockerfile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 975f5f9..5e60f2a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,8 +2,12 @@
 #LABEL authors="solor"
 #
 #ENTRYPOINT ["top", "-b"]
-
 FROM openjdk:17-slim
+
 ARG JAR_FILE=build/libs/*.jar
 COPY ${JAR_FILE} app.jar
-ENTRYPOINT ["java","-jar","/app.jar"]
\ No newline at end of file
+
+# 애플리케이션 설정 파일을 JAR 파일과 같은 디렉토리로 복사
+COPY src/main/resources/application.yml /app/config/application.yml
+
+ENTRYPOINT ["java", "-Dspring.config.location=file:/app/config/application.yml", "-jar", "/app.jar"]

From fdde2db6ee5dca93c1d00714db2bea27222e49ed Mon Sep 17 00:00:00 2001
From: 20210699 <20210699@duksung.ac.kr>
Date: Wed, 28 Aug 2024 02:15:23 +0900
Subject: [PATCH 10/13] [Feat] CI test 8

---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5e60f2a..084a38b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,6 @@ FROM openjdk:17-slim
 ARG JAR_FILE=build/libs/*.jar
 COPY ${JAR_FILE} app.jar
 
-# 애플리케이션 설정 파일을 JAR 파일과 같은 디렉토리로 복사
 COPY src/main/resources/application.yml /app/config/application.yml
 
 ENTRYPOINT ["java", "-Dspring.config.location=file:/app/config/application.yml", "-jar", "/app.jar"]

From f9061db3521a3531894c88c3937069d0416e657b Mon Sep 17 00:00:00 2001
From: 20210699 <20210699@duksung.ac.kr>
Date: Wed, 28 Aug 2024 02:16:49 +0900
Subject: [PATCH 11/13] [Feat] CI test 9

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 084a38b..279981e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,6 +7,6 @@ FROM openjdk:17-slim
 ARG JAR_FILE=build/libs/*.jar
 COPY ${JAR_FILE} app.jar
 
-COPY src/main/resources/application.yml /app/config/application.yml
+#COPY src/main/resources/application.yml /app/config/application.yml
 
 ENTRYPOINT ["java", "-Dspring.config.location=file:/app/config/application.yml", "-jar", "/app.jar"]

From 7976747b1e70d8d31a7f136d95948ffb57b253d1 Mon Sep 17 00:00:00 2001
From: 20210699 <20210699@duksung.ac.kr>
Date: Wed, 28 Aug 2024 02:20:19 +0900
Subject: [PATCH 12/13] [Feat] CI test 10

---
 Dockerfile | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 279981e..975f5f9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,11 +2,8 @@
 #LABEL authors="solor"
 #
 #ENTRYPOINT ["top", "-b"]
-FROM openjdk:17-slim
 
+FROM openjdk:17-slim
 ARG JAR_FILE=build/libs/*.jar
 COPY ${JAR_FILE} app.jar
-
-#COPY src/main/resources/application.yml /app/config/application.yml
-
-ENTRYPOINT ["java", "-Dspring.config.location=file:/app/config/application.yml", "-jar", "/app.jar"]
+ENTRYPOINT ["java","-jar","/app.jar"]
\ No newline at end of file

From b454c447173e64644d812ec0a3cf7e987d285e87 Mon Sep 17 00:00:00 2001
From: 20210699 <20210699@duksung.ac.kr>
Date: Wed, 28 Aug 2024 02:29:56 +0900
Subject: [PATCH 13/13] [Feat] CI test 11

---
 .github/workflows/dev_deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml
index 8368898..0ae0340 100644
--- a/.github/workflows/dev_deploy.yml
+++ b/.github/workflows/dev_deploy.yml
@@ -121,7 +121,7 @@ jobs:
 
       # Docker 이미지 Build (2)
       - name: docker image build
-        run: docker build -t maeummal/maeummal-cicd:${{ github.sha }} .
+        run: docker build -t maeummal/maeummal-cicd .
 
       # DockerHub Login (3)
       - name: docker login
@@ -132,4 +132,4 @@ jobs:
 
       # Docker Hub push (4)
       - name: docker Hub push
-        run: docker push maeummal/maeummal-cicd:${{ github.sha }}
+        run: docker push maeummal/maeummal-cicd