Merge pull request #32 from Sopo2023/feat/#1

Feat/#1
Sopo2023 · Jul 28, 2024 · b9baf4f · b9baf4f
2 parents ad60762 + 03c4f2d
commit b9baf4f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ jobs:
   CI-CD:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: Checkout
       - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
@@ -33,12 +33,6 @@ jobs:
           docker build -f Dockerfile -t ${{ secrets.DOCKER_USERNAME }}/sopo_v2 . 
           docker push ${{ secrets.DOCKER_USERNAME }}/sopo_v2
 
-      - name: Upload JAR file
-        uses: actions/upload-artifact@v3
-        with:
-          name: my-jar
-          path: build/libs/SOPO_server_v2-0.0.1-SNAPSHOT-plain.jar
-
       - name: Deploy to Production
         uses: appleboy/ssh-action@master
         id: deploy-prod

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
-FROM openjdk:17
-ARG JAR_FILE=build/libs/SOPO_server_v2-0.0.1-SNAPSHOT-plain.jar
+FROM node:16-alpine as builder
+ARG JAR_FILE=build/libs/sopo-2.0.0.jar
 COPY ${JAR_FILE} /sopo.jar
 ENV TZ=Asia/Seoul
 ENTRYPOINT ["java","-jar","/sopo.jar","-Duser.timezone=Asia/Seoul"]
diff --git a/build.gradle b/build.gradle
@@ -13,6 +13,10 @@ java {
 	}
 }
 
+jar {
+	archiveFileName.set('sopo-2.0.0.jar')
+}
+
 configurations {
 	compileOnly {
 		extendsFrom annotationProcessor