diff --git a/.github/workflows/dev-build-deploy-api.yml b/.github/workflows/dev-build-deploy-api.yml index 3ae0f9ca..e2eff054 100644 --- a/.github/workflows/dev-build-deploy-api.yml +++ b/.github/workflows/dev-build-deploy-api.yml @@ -65,7 +65,7 @@ jobs: goose -dir ./apps/api/internal/db/migrations postgres "${{ secrets.DEV_DB_URL }}" up deploy: - name: Deploy to Production Server + name: Deploy to Development Server runs-on: ubuntu-latest needs: [build-and-push, run-migrations] @@ -83,6 +83,9 @@ jobs: proxy_port: ${{ secrets.SSH_PORT_JUMP }} script: | cd /home/admin/core/infra + git fetch + git checkout dev + git reset --hard origin/dev git pull infisical export --env=dev --format=dotenv --path="/api" --projectId=${{ secrets.INFISICAL_PROJECT_ID }} > ./secrets/.env.dev.api docker compose -f docker-compose.dev.yml pull api diff --git a/.github/workflows/prod-build-deploy-api.yml b/.github/workflows/prod-build-deploy-api.yml index b95d30ba..8250e992 100644 --- a/.github/workflows/prod-build-deploy-api.yml +++ b/.github/workflows/prod-build-deploy-api.yml @@ -85,6 +85,9 @@ jobs: proxy_port: ${{ secrets.SSH_PORT_JUMP }} script: | cd /home/admin/core/infra + git fetch + git checkout master + git reset --hard origin/master git pull infisical export --env=prod --format=dotenv --path="/api" --projectId=${{ secrets.INFISICAL_PROJECT_ID }} > ./secrets/.env.api docker compose pull api diff --git a/infra/docker-compose.dev.yml b/infra/docker-compose.dev.yml index 75c1a58a..c55fcec8 100644 --- a/infra/docker-compose.dev.yml +++ b/infra/docker-compose.dev.yml @@ -1,5 +1,5 @@ services: - api: + dev-api: image: ghcr.io/swamphacks/core-api:dev ports: - "8081:8080"