Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,18 @@ jobs:
username: ubuntu
key: ${{ secrets.EC2_KEY }}
port: '22'
source: "./docker"
source: "./docker/docker-compose.yml, docker/.env"
target: "~/app"

- name: Login to DockerHub
run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin

- name: Build Docker image
run: docker build -t shlee054/ticket911-app:latest ./docker

- name: Push Docker image
run: docker push shlee054/ticket911-app:latest

- name: Deploy via SSH
uses: appleboy/ssh-action@master
with:
Expand Down Expand Up @@ -69,11 +78,7 @@ jobs:
# Kill existing Java Processes
pkill -f 'java -jar' || true

# Deploy with Docker Compose
cd ~/app/docker || exit 1
docker compose down --remove-orphans || true
docker compose up --build -d

echo "Waiting for containers to be up..."
sleep 10
docker compose ps
cd ~/app || exit 1
sudo docker compose pull
sudo docker compose down --remove-orphans || true
sudo docker compose up -d
4 changes: 1 addition & 3 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ version: "3.9"

services:
app:
build:
context: ..
dockerfile: docker/Dockerfile
image: shlee054/ticket911-app:latest
container_name: ticket911-app
ports:
- "8080:8080"
Expand Down
Loading