diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 6a20a15..ebb8f13 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -12,12 +12,6 @@ jobs: - name: Check Out Repo uses: actions/checkout@v2 - - name: Determine Changed Directories - id: changes - uses: tj-actions/changed-files@v34 - with: - files: | - apps/**/* - name: Log in to Docker Hub uses: docker/login-action@v1 @@ -27,14 +21,9 @@ jobs: - name: Build and Push Docker image run: | - for dir in $(echo "${{ steps.changes.outputs.modified_files }}" | tr ',' '\n' | sed 's|^\([^/]*\)/\([^/]*\).*|\1/\2|' | sort | uniq); do - if [[ $dir == apps/* ]]; then - app_name=$(basename $dir) - echo "Building and pushing $app_name" - docker-compose build $app_name - docker-compose push $app_name - fi - done + docker-compose build + docker-compose push + - name: Deploy to EC2 uses: appleboy/ssh-action@master @@ -45,11 +34,6 @@ jobs: username: ${{ secrets.SSH_USERNAME }} key: ${{ secrets.SSH_KEY }} script: | - CHANGED_APPS=$(echo "${{ steps.changes.outputs.modified_files }}" | tr ',' '\n' | sed 's|^\([^/]*\)/\([^/]*\).*|\1/\2|' | sort | uniq | grep '^apps/' | xargs -n 1 basename) - cd /home/ubuntu/saas-apps - for app in $CHANGED_APPS; do - echo "Deploying $app" - cd /home/ubuntu/saas-apps && sudo docker-compose pull $app - cd /home/ubuntu/saas-apps && sudo docker-compose rm -f $app - cd /home/ubuntu/saas-apps && sudo docker-compose up -d $app - done \ No newline at end of file + cd /home/ubuntu/saas-apps && sudo docker-compose pull + cd /home/ubuntu/saas-apps && sudo docker-compose rm -f + cd /home/ubuntu/saas-apps && sudo docker-compose up -d \ No newline at end of file