fix: #1 conflict해결

.github/workflows/cicd.yml

@@ -0,0 +1,56 @@
+name: Auth CI/CD
+
+on:
+  push:
+    branches: [ main ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Clear Gradle cache
+        run: rm -rf ~/.gradle/caches/
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Build with Gradle
+        run: ./gradlew build --no-daemon
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build and push Docker image
+        run: |
+          docker build -t ${{ secrets.DOCKER_USERNAME }}/sunjoo:auth .
+          docker push ${{ secrets.DOCKER_USERNAME }}/sunjoo:auth
+
+      - name: SSH and Deploy
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.HOST }}
+          username: ${{ secrets.USERNAME }}
+          key: ${{ secrets.KEY }}
+          port: ${{ secrets.PORT }}
+          script: |
+            docker pull ${{ secrets.DOCKER_USERNAME }}/sunjoo:auth
+            if [ "$(docker ps -aq -f name=sunjoo-server-auth)" ]; then
+              docker stop sunjoo-server-auth
+              docker rm sunjoo-server-auth
+            fi
+            docker run -d -p 8080:8090 --name sunjoo-server-auth ${{ secrets.DOCKER_USERNAME }}/sunjoo:auth

Dockerfile

@@ -1,5 +1,3 @@
 FROM openjdk:17
-CMD ["./gradlew", "clean", "build"]
-ARG JAR_FILE_PATH=build/libs/*.jar
-COPY ${JAR_FILE_PATH} app.jar
+COPY build/libs/*.jar app.jar
 ENTRYPOINT ["java", "-jar", "app.jar"]

docker-compose.yml

@@ -0,0 +1,10 @@
+version: '3.8'
+services:
+  auth:
+    image: sunyerim/sunjoo:auth
+    container_name: sunjoo-server-auth
+    restart: always
+    #    depends_on:
+    #      - redis
+    ports:
+      - "8080:8090"