diff --git a/.github/workflows/dev-deploy.yml b/.github/workflows/dev-deploy.yml index 52384b3..8199f88 100644 --- a/.github/workflows/dev-deploy.yml +++ b/.github/workflows/dev-deploy.yml @@ -77,7 +77,7 @@ jobs: host: ${{ secrets.HOST_DEV }} username: ${{ secrets.USER_DEV }} key: ${{ secrets.KEY_DEV }} - script: mkdir -p ./dev + script: mkdir -p ./ness ## 소스 코드 복사 붙여넣기 - name: copy source via ssh key @@ -85,12 +85,15 @@ jobs: with: switches: -avzr --delete path: ./config - remote_path: ./dev + remote_path: ./ness remote_host: ${{ secrets.HOST_DEV }} remote_user: ${{ secrets.USER_DEV }} remote_key: ${{ secrets.KEY_DEV }} ## EC2에 배포(CD) + ## 아래 두 개는 이미 되어 있는 상태 + ## docker network create ness_network + ## docker network connect ness_network redis-server - name: executing remote ssh commands using password uses: appleboy/ssh-action@master with: @@ -104,4 +107,5 @@ jobs: sudo docker rm $(sudo docker ps -a --filter="name=backend-server" -q) sudo docker rmi $(sudo docker images -q) docker pull jeonhaeseung/ness-server-dev:dev - docker run -d --name backend-server -p 80:8080 --restart unless-stopped jeonhaeseung/ness-server-dev:dev \ No newline at end of file + docker run -d --name backend-server -p 80:8080 --restart unless-stopped jeonhaeseung/ness-server-dev:dev + docker network connect ness_network backend-server \ No newline at end of file diff --git a/.github/workflows/prod-deploy.yml b/.github/workflows/prod-deploy.yml index 08d2d48..341339c 100644 --- a/.github/workflows/prod-deploy.yml +++ b/.github/workflows/prod-deploy.yml @@ -82,7 +82,7 @@ jobs: host: ${{ secrets.HOST_PROD }} username: ${{ secrets.USER_PROD }} key: ${{ secrets.KEY_PROD }} - script: mkdir -p ./prod + script: mkdir -p ./ness ## 소스 코드 복사 붙여넣기 - name: copy source via ssh key @@ -90,12 +90,15 @@ jobs: with: switches: -avzr --delete path: ./config - remote_path: ./prod + remote_path: ./ness remote_host: ${{ secrets.HOST_PROD }} remote_user: ${{ secrets.USER_PROD }} remote_key: ${{ secrets.KEY_PROD }} ## EC2에 배포(CD) + ## 아래 두 개는 이미 되어 있는 상태 + ## docker network create ness_network + ## docker network connect ness_network redis-server - name: executing remote ssh commands using password uses: appleboy/ssh-action@master with: @@ -109,4 +112,5 @@ jobs: sudo docker rm $(sudo docker ps -a --filter="name=backend-server" -q) sudo docker rmi $(sudo docker images -q) docker pull jeonhaeseung/ness-server-prod:main - docker run -d --name backend-server -p 80:8080 --restart unless-stopped jeonhaeseung/ness-server-prod:main \ No newline at end of file + docker run -d --name backend-server -p 80:8080 --restart unless-stopped jeonhaeseung/ness-server-prod:main + docker network connect ness_network backend-server \ No newline at end of file diff --git a/.gitignore b/.gitignore index 34a7be7..80aff16 100644 --- a/.gitignore +++ b/.gitignore @@ -38,7 +38,4 @@ out/ ### Secrets ### application-dev.yml -application-prod.yml - -## etc ### -docker-compose.yml \ No newline at end of file +application-prod.yml \ No newline at end of file diff --git a/config/scripts/deploy.sh b/config/scripts/deploy.sh index ba44a63..d2e00b1 100644 --- a/config/scripts/deploy.sh +++ b/config/scripts/deploy.sh @@ -15,11 +15,8 @@ fi if ! type docker-compose > /dev/null then - echo "docker does not exist" - echo "Start installing docker" - sudo dnf install -y libxcrypt-compat echo "docker-compose does not exist" echo "Start installing docker-compose" - sudo curl -L "https://github.com/docker/compose/releases/download/1.27.3/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose + sudo curl -L https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose sudo chmod +x /usr/local/bin/docker-compose fi \ No newline at end of file