Merge pull request #3 from PLADI-ALM/infra/PDS-23-test

[PDS-5/infra] TestController 작성

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,9 +1,16 @@
-### 📝 Description
-이슈 번호 : #번호
+## ✈️ 지라 티켓
+- [PDS-지라번호](https://pladi-alm.atlassian.net/browse/PDS-지라번호) 티켓설명
 
-### 💽 Commits
-- 1
-- 2
+<br>
 
+## 👾 작업 내용
+- 
 
-### 🖼 결과
+<br>
+
+## 📸 스크린샷
+
+<br>
+
+## 🎸 기타 사항
+- 

.github/workflows/github-action.yml

@@ -62,30 +62,34 @@ jobs:
       if: contains(github.ref, 'main')
       run: |
           docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
-          docker build -f Dockerfile-prod -t ${{ secrets.DOCKER_REPO }}/dotoriham-prod .
-          docker push ${{ secrets.DOCKER_REPO }}/dotoriham-prod
+          docker build -f Dockerfile-prod -t ${{ secrets.DOCKER_REPO }}/pladi-prod .
+          docker push ${{ secrets.DOCKER_REPO }}/pladi-prod
 
         ## docker build & push to develop
     - name: Docker build & push to dev
       if: contains(github.ref, 'develop')
       run: |
           docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
-          docker build -f Dockerfile-dev -t ${{ secrets.DOCKER_REPO }}/dotoriham-dev .
-          docker push ${{ secrets.DOCKER_REPO }}/dotoriham-dev
+          docker build -f Dockerfile-dev -t ${{ secrets.DOCKER_REPO }}/pladi-dev .
+          docker push ${{ secrets.DOCKER_REPO }}/pladi-dev
 
    ## deploy to production
     - name: Deploy to prod
       uses: appleboy/ssh-action@master
       id: deploy-prod
       if: contains(github.ref, 'main')
       with:
+#          host: ${{ secrets.HOST_PROD }}
+#          username: ec2-user
+#          key: ${{ secrets.PRIVATE_KEY }}
+#          envs: GITHUB_SHA
           host: ${{ secrets.HOST_PROD }}
-          username: ec2-user
-          key: ${{ secrets.PRIVATE_KEY }}
-          envs: GITHUB_SHA
+          username: ${{ secrets.USERNAME }}
+          password: ${{ secrets.PASSWORD }}
+          port: 22
           script: |
               sudo docker rm -f $(docker ps -qa)
-              sudo docker pull ${{ secrets.DOCKER_REPO }}/dotoriham-prod
+              sudo docker pull ${{ secrets.DOCKER_REPO }}/pladi-prod
               docker-compose up -d
               docker image prune -f
 
@@ -102,7 +106,7 @@ jobs:
         #key: ${{ secrets.PRIVATE_KEY }}
         script: |
             sudo docker rm -f $(docker ps -qa)
-            sudo docker pull ${{ secrets.DOCKER_REPO }}/dotoriham-dev
+            sudo docker pull ${{ secrets.DOCKER_REPO }}/pladi-dev
             docker-compose up -d
             docker image prune -f
 

Dockerfile-dev

@@ -1,6 +1,6 @@
 ## Dockerfile-dev
 FROM openjdk:11-jdk
 EXPOSE 8080
-ARG JAR_FILE=/build/libs/Web-Team-2-Backend-0.0.1-SNAPSHOT.jar
+ARG JAR_FILE=/build/libs/PLADI-ALM-Server-0.0.1-SNAPSHOT.jar
 COPY ${JAR_FILE} app.jar
-ENTRYPOINT ["java","-jar","-Dspring.profiles.active=dev","/app.jar"]
+ENTRYPOINT ["java","-jar","-Djasypt.encryptor.password=pladi1234!","-Dspring.profiles.active=dev","/app.jar"]

Dockerfile-prod

@@ -1,6 +1,6 @@
 ## Dockerfile-prod
 FROM openjdk:11-jdk
 EXPOSE 8080
-ARG JAR_FILE=/build/libs/Web-Team-2-Backend-0.0.1-SNAPSHOT.jar
+ARG JAR_FILE=/build/libs/PLADI-ALM-Server-0.0.1-SNAPSHOT.jar
 COPY ${JAR_FILE} app.jar
-ENTRYPOINT ["java","-jar","-Dspring.profiles.active=prod","/app.jar"]
+ENTRYPOINT ["java","-jar","-Djasypt.encryptor.password=pladi1234!","-Dspring.profiles.active=prod","/app.jar"]

src/main/java/com/example/pladialmserver/global/controller/TestController.java

@@ -0,0 +1,14 @@
+package com.example.pladialmserver.global.controller;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class TestController {
+
+  @GetMapping("/test")
+  public ResponseEntity<String> testController() {
+    return ResponseEntity.ok("hello github-action");
+  }
+}