diff --git a/.github/workflows/cd_template.yaml b/.github/workflows/cd_template.yaml index fe1b3af..79f6533 100644 --- a/.github/workflows/cd_template.yaml +++ b/.github/workflows/cd_template.yaml @@ -33,7 +33,7 @@ jobs: echo "MYSQL_PASSWORD=${{ secrets.MYSQL_PASSWORD }}" >> .env - name: copy jar to server - uses: appleboy/scp-action@master + uses: appleboy/scp-action@v0.1.7 with: host: ${{ secrets.SSH_HOST }} username: ec2-user @@ -44,7 +44,7 @@ jobs: - name: Copy Docker files - uses: appleboy/scp-action@master + uses: appleboy/scp-action@v0.1.7 with: host: ${{ secrets.SSH_HOST }} username: ec2-user diff --git a/docker-compose.yaml b/docker-compose.yaml index d5c8d58..bf0a83b 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -9,8 +9,11 @@ services: MYSQL_USER: ${MYSQL_USER} MYSQL_PASSWORD: ${MYSQL_PASSWORD} depends_on: - - mysql - - redis + mysql: + condition: service_healthy + redis: + condition: service_started + restart: on-failure mysql: image: mysql:8.0 @@ -22,6 +25,13 @@ services: MYSQL_DATABASE: ${MYSQL_DATABASE} MYSQL_USER: ${MYSQL_USER} MYSQL_PASSWORD: ${MYSQL_PASSWORD} + restart: unless-stopped + healthcheck: + test: [ "CMD", "mysqladmin", "ping", "-h", "localhost" ] + interval: 5s + timeout: 3s + retries: 10 + start_period: 30s redis: image: redis:7