Merge pull request #58 from dajeongdev/feature/github-actions

chore : docker compose 추가

.github/workflows/deploy.yml

@@ -41,31 +41,19 @@ jobs:
         run: ./gradlew clean build -x test
 
       # Docker Buildx 설치
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to NCP Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ secrets.NCP_CONTAINER_REGISTRY }}
-          username: ${{ secrets.NCP_ACCESS_KEY }}
-          password: ${{ secrets.NCP_SECRET_KEY }}
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          tags: ${{ secrets.NCP_CONTAINER_REGISTRY }}/americanote:latest
-          cache-from: type=registry,ref=${{ secrets.NCP_CONTAINER_REGISTRY }}/americanote:latest
-          cache-to: type=inline
+      - name: web docker build and push
+        run: |
+          docker login -u ${{ secrets.NCP_ACCESS_KEY }} -p ${{ secrets.NCP_SECRET_KEY }}
+          docker build -t ${{ secrets.NCP_CONTAINER_REGISTRY }}/americanote_docker .
+          docker push ${{ secrets.DOCKER_REPO }}/americanote_docker
           
 
   deploy:
     name: Connect server ssh and pull from container registry
     needs: build
     runs-on: ubuntu-latest
 
+    # Access Server & Docker compose up
     steps:
       - name: Connect ssh
         uses: appleboy/ssh-action@master
@@ -75,8 +63,8 @@ jobs:
           password: ${{ secrets.NCP_PASSWORD }}
           port: ${{ secrets.NCP_PORT }}
           script: |
-            docker pull ${{ secrets.NCP_CONTAINER_REGISTRY }}/americanote
-            docker stop $(docker ps -a -q)
-            docker rm $(docker ps -a -q)
-            docker run -d -p 8009:80 --name americanote_docker ${{ secrets.NCP_CONTAINER_REGISTRY }}/americanote
+            sudo docker rm -f $(docker ps -a -q)
+            sudo docker pull ${{ secrets.NCP_CONTAINER_REGISTRY }}/americanote_docker
+            sudo docker pull ${{ secrets.NCP_CONTAINER_REGISTRY }}/americanote_nginx
+            docker-compose up -d
             docker image prune -f

Dockerfile

@@ -1,5 +1,4 @@
 FROM openjdk:17
 ARG JAR_FILE=build/libs/*.jar
 COPY ${JAR_FILE} app.jar
-ENTRYPOINT ["java","-jar","/app.jar"]\
-EXPOSE 8009
+ENTRYPOINT ["java","-jar","/app.jar"]

docker-compose.yml

@@ -0,0 +1,19 @@
+version: '3.8'
+
+services:
+  app:
+    image: americanote_docker
+    container_name: app
+    expose:
+      - 8009
+    ports:
+      - 8009:8009
+
+  nginx:
+    image: americanote_nginx
+    container_name: nginx
+    ports:
+      - 80:80
+      - 443:443
+    depends_on:
+      - app