diff --git a/.github/workflows/develop-cd.yml b/.github/workflows/develop-cd.yml index 4550771..cd6cbae 100644 --- a/.github/workflows/develop-cd.yml +++ b/.github/workflows/develop-cd.yml @@ -48,14 +48,15 @@ jobs: - name: Deploy uses: appleboy/ssh-action@v0.1.4 + env: + COMPOSE: "/home/ubuntu/compose/docker-compose-dev.yml" with: host: ${{ secrets.DEV_HOST }} username: ${{ secrets.USERNAME }} key: ${{ secrets.DEV_PRIVATE_KEY }} port: ${{ secrets.DEV_PORT }} + envs: COMPOSE script: | - docker pull ${{ secrets.DOCKER_USERNAME }}/phote:latest - docker stop $(docker ps -a -q) - docker run -d --log-driver=syslog -p 8080:8080 ${{ secrets.DOCKER_USERNAME }}/phote:latest - docker rm $(docker ps --filter 'status=exited' -a -q) - docker image prune -a -f + sudo docker-compose -f $COMPOSE down --rmi all + sudo docker pull ${{ secrets.DOCKER_USERNAME }}/phote:latest + sudo docker-compose -f $COMPOSE up -d diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 0ab4bce..944ac51 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -1,12 +1,29 @@ services: redis: image: redis - container_name: redis + container_name: myredis + restart: unless-stopped volumes: - - /var/lib/docker/volumes/redis-volume/_data:/data + - /var/lib/docker/volumes/redis-volume/_data:/data ports: - "6379:6379" + environment: + - TZ=Asia/Seoul hostname: redis + networks: + - phote-network + jarimage: + image: ${{ secrets.DOCKER_USERNAME }}/phote:latest + restart: unless-stopped + container_name: myphote + environment: + - TZ=Asia/Seoul + ports: + - 8080:8080 + networks: + - phote-network - +networks: + phote-network: + external: true