diff --git a/.github /CODEOWNERS b/.github/CODEOWNERS similarity index 100% rename from .github /CODEOWNERS rename to .github/CODEOWNERS diff --git a/.github /ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md similarity index 100% rename from .github /ISSUE_TEMPLATE/feature.md rename to .github/ISSUE_TEMPLATE/feature.md diff --git a/.github /PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from .github /PULL_REQUEST_TEMPLATE.md rename to .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github /workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml similarity index 80% rename from .github /workflows/deploy-prod.yml rename to .github/workflows/deploy-prod.yml index 5807988f..fa32a202 100644 --- a/.github /workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -1,8 +1,11 @@ name: Deploy to production on: + workflow_dispatch: push: - branches: [ develop, main ] + branches: + - develop + - main jobs: build-docker-image-and-push: @@ -11,7 +14,7 @@ jobs: - name: Checkout Repository uses: actions/checkout@v4 with: - token: ${{ secrets.SUBMODULE_SCOPED_TOKEN }} + token: ${{ secrets.SUBMODULE_TOKEN }} submodules: true - name: Setup JDK 17 @@ -39,7 +42,6 @@ jobs: context: . push: true file: ./Dockerfile - platforms: linux/arm64 tags: ${{ secrets.DOCKER_HUB_REPOSITORY }}:prod deployment: @@ -53,5 +55,8 @@ jobs: username: ${{ secrets.EC2_USERNAME }} key: ${{ secrets.AWS_SSH_KEY }} script: | + echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin + cd api/bin/ sudo docker compose down - sudo docker compose -f /home/ubuntu/api/bin/docker-compose.yml up -d + sudo docker compose up -d + sudo docker image prune -af diff --git a/.github /workflows/gradle-CI.yml b/.github/workflows/gradle-CI.yml similarity index 100% rename from .github /workflows/gradle-CI.yml rename to .github/workflows/gradle-CI.yml