Skip to content

Commit a442351

Browse files
AlexanderWangYAlexanderWangY
authored
Merge branch 'dev' into TECH-195
2 parents 07ffcec + 9ab84a4 commit a442351

112 files changed

Lines changed: 3043 additions & 604 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/dev-build-deploy-api.yml‎

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- dev
77
paths:
88
- 'apps/api/**'
9-
- 'infra/docker-compose.dev.yml'
9+
- 'infra/docker-compose.api.yml'
1010
workflow_dispatch:
1111

1212
permissions:
@@ -21,27 +21,20 @@ jobs:
2121
steps:
2222
- name: Checkout repository
2323
uses: actions/checkout@v4
24-
25-
- name: Set up QEMU for cross-platform builds
26-
uses: docker/setup-qemu-action@v2
27-
28-
- name: Set up Docker Buildx
29-
uses: docker/setup-buildx-action@v2
30-
24+
3125
- name: Log in to GitHub Container Registry
3226
uses: docker/login-action@v2
3327
with:
3428
registry: ghcr.io
3529
username: ${{ github.actor }}
3630
password: ${{ secrets.GITHUB_TOKEN }}
3731

38-
- name: Build and push multi-arch image
32+
- name: Build and push Docker image
3933
run: |
40-
docker buildx build \
41-
--platform linux/amd64,linux/arm64 \
42-
--push \
34+
docker build \
4335
-t ghcr.io/${{ github.repository_owner }}/core-api:dev \
4436
./apps/api
37+
docker push ghcr.io/${{ github.repository_owner }}/core-api:dev
4538
4639
run-migrations:
4740
name: Run Goose Migrations
@@ -69,20 +62,15 @@ jobs:
6962
- name: SSH proxy commmand
7063
uses: appleboy/ssh-action@v1
7164
with:
72-
host: ${{ secrets.SSH_HOST_SWAMPHACKS }}
73-
username: ${{ secrets.SSH_USERNAME_SWAMPHACKS }}
74-
key: ${{ secrets.SSH_KEY_SWAMPHACKS }}
75-
port: ${{ secrets.SSH_PORT_SWAMPHACKS }}
76-
proxy_host: ${{ secrets.SSH_HOST_JUMP }}
77-
proxy_username: ${{ secrets.SSH_USERNAME_JUMP }}
78-
proxy_key: ${{ secrets.SSH_KEY_JUMP }}
79-
proxy_port: ${{ secrets.SSH_PORT_JUMP }}
65+
host: ${{ secrets.API_HOST}}
66+
username: root
67+
password: ${{ secrets.API_PASSWORD}}
8068
script: |
81-
cd /home/admin/core/infra
69+
cd /root/core/infra
8270
git fetch
8371
git checkout dev
8472
git reset --hard origin/dev
8573
git pull
8674
infisical export --env=dev --format=dotenv --path="/api" --projectId=${{ secrets.INFISICAL_PROJECT_ID }} > ./secrets/.env.dev.api
87-
docker compose -f docker-compose.dev.yml pull dev-api
88-
docker compose -f docker-compose.dev.yml up -d --no-deps --force-recreate dev-api
75+
docker compose -f docker-compose.api.yml pull api-dev
76+
docker compose -f docker-compose.api.yml up -d --no-deps --force-recreate api-dev

‎.github/workflows/dev-build-deploy-email-worker.yml‎

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- dev
77
paths:
88
- 'apps/api/**'
9-
- 'infra/docker-compose.dev.yml'
9+
- 'infra/docker-compose.api.yml'
1010
workflow_dispatch:
1111

1212
permissions:
@@ -22,28 +22,21 @@ jobs:
2222
- name: Checkout repository
2323
uses: actions/checkout@v4
2424

25-
- name: Set up QEMU for cross-platform builds
26-
uses: docker/setup-qemu-action@v2
27-
28-
- name: Set up Docker Buildx
29-
uses: docker/setup-buildx-action@v2
30-
3125
- name: Log in to GitHub Container Registry
3226
uses: docker/login-action@v2
3327
with:
3428
registry: ghcr.io
3529
username: ${{ github.actor }}
3630
password: ${{ secrets.GITHUB_TOKEN }}
3731

38-
- name: Build and push multi-arch image
32+
- name: Build and push Docker image
3933
run: |
40-
docker buildx build \
41-
--platform linux/amd64,linux/arm64 \
34+
docker build \
4235
--target prod \
43-
--push \
4436
-f ./apps/api/cmd/email_worker/Dockerfile \
4537
-t ghcr.io/${{ github.repository_owner }}/core-email-worker:dev \
4638
./apps/api
39+
docker push ghcr.io/${{ github.repository_owner }}/core-email-worker:dev
4740
4841
run-migrations:
4942
name: Run Goose Migrations
@@ -71,20 +64,15 @@ jobs:
7164
- name: SSH proxy commmand
7265
uses: appleboy/ssh-action@v1
7366
with:
74-
host: ${{ secrets.SSH_HOST_SWAMPHACKS }}
75-
username: ${{ secrets.SSH_USERNAME_SWAMPHACKS }}
76-
key: ${{ secrets.SSH_KEY_SWAMPHACKS }}
77-
port: ${{ secrets.SSH_PORT_SWAMPHACKS }}
78-
proxy_host: ${{ secrets.SSH_HOST_JUMP }}
79-
proxy_username: ${{ secrets.SSH_USERNAME_JUMP }}
80-
proxy_key: ${{ secrets.SSH_KEY_JUMP }}
81-
proxy_port: ${{ secrets.SSH_PORT_JUMP }}
67+
host: ${{ secrets.API_HOST }}
68+
username: root
69+
password: ${{ secrets.API_PASSWORD }}
8270
script: |
83-
cd /home/admin/core/infra
71+
cd /root/core/infra
8472
git fetch
8573
git checkout dev
8674
git reset --hard origin/dev
8775
git pull
8876
infisical export --env=dev --format=dotenv --path="/api" --projectId=${{ secrets.INFISICAL_PROJECT_ID }} > ./secrets/.env.dev.api
89-
docker compose -f docker-compose.dev.yml pull dev-email-worker
90-
docker compose -f docker-compose.dev.yml up -d --no-deps --force-recreate dev-email-worker
77+
docker compose -f docker-compose.api.yml pull email-worker-dev
78+
docker compose -f docker-compose.api.yml up -d --no-deps --force-recreate email-worker-dev

.github/workflows/dev-build-deplay-web.yml renamed to .github/workflows/dev-build-deploy-web.yml

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- dev
77
paths:
88
- 'apps/web/**'
9-
- 'infra/docker-compose.dev.yml'
9+
- 'infra/docker-compose.web.yml'
1010
workflow_dispatch:
1111

1212
permissions:
@@ -22,28 +22,25 @@ jobs:
2222
- name: Checkout repository
2323
uses: actions/checkout@v4
2424

25-
- name: Set up QEMU for cross-platform builds
26-
uses: docker/setup-qemu-action@v2
27-
28-
- name: Set up Docker Buildx
29-
uses: docker/setup-buildx-action@v2
30-
3125
- name: Log in to GitHub Container Registry
3226
uses: docker/login-action@v2
3327
with:
3428
registry: ghcr.io
3529
username: ${{ github.actor }}
3630
password: ${{ secrets.GITHUB_TOKEN }}
3731

38-
- name: Build and push multi-arch image
32+
- name: Build Docker image
3933
run: |
40-
docker buildx build \
41-
--platform linux/amd64,linux/arm64 \
42-
--push \
34+
docker build \
35+
--platform linux/amd64 \
4336
-t ghcr.io/${{ github.repository_owner }}/core-web:dev \
44-
--file ./apps/web/Dockerfile.dev \
37+
--file ./apps/web/Dockerfile \
38+
--target prod \
4539
./apps/web
4640
41+
- name: Push Docker image
42+
run: |
43+
docker push ghcr.io/${{ github.repository_owner }}/core-web:dev
4744
deploy:
4845
name: Deploy to Development Server
4946
runs-on: ubuntu-latest
@@ -53,21 +50,16 @@ jobs:
5350
- name: SSH proxy commmand
5451
uses: appleboy/ssh-action@v1
5552
with:
56-
host: ${{ secrets.SSH_HOST_SWAMPHACKS }}
57-
username: ${{ secrets.SSH_USERNAME_SWAMPHACKS }}
58-
key: ${{ secrets.SSH_KEY_SWAMPHACKS }}
59-
port: ${{ secrets.SSH_PORT_SWAMPHACKS }}
60-
proxy_host: ${{ secrets.SSH_HOST_JUMP }}
61-
proxy_username: ${{ secrets.SSH_USERNAME_JUMP }}
62-
proxy_key: ${{ secrets.SSH_KEY_JUMP }}
63-
proxy_port: ${{ secrets.SSH_PORT_JUMP }}
53+
host: ${{ secrets.WEB_HOST }}
54+
username: root
55+
password: ${{ secrets.WEB_PASSWORD }}
6456
script: |
65-
cd /home/admin/core/infra
57+
cd /root/core/infra
6658
git fetch
6759
git checkout dev
6860
git reset --hard origin/dev
6961
git pull
7062
infisical export --env=dev --format=dotenv --path="/web" --projectId=${{ secrets.INFISICAL_PROJECT_ID }} > ./secrets/.env.dev.web
71-
docker compose -f docker-compose.dev.yml pull dev-web
72-
docker compose -f docker-compose.dev.yml up -d --no-deps --force-recreate dev-web
63+
docker compose -f docker-compose.web.yml pull web-dev
64+
docker compose -f docker-compose.web.yml up -d --no-deps --force-recreate web-dev
7365

‎.github/workflows/prod-build-deploy-api.yml‎

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- master
77
paths:
88
- 'apps/api/**'
9-
- 'infra/docker-compose.yml'
9+
- 'infra/docker-compose.api.yml'
1010
workflow_dispatch:
1111

1212
permissions:
@@ -24,26 +24,19 @@ jobs:
2424
- name: Checkout repository
2525
uses: actions/checkout@v4
2626

27-
- name: Set up QEMU for cross-platform builds
28-
uses: docker/setup-qemu-action@v2
29-
30-
- name: Set up Docker Buildx
31-
uses: docker/setup-buildx-action@v2
32-
3327
- name: Log in to GitHub Container Registry
3428
uses: docker/login-action@v2
3529
with:
3630
registry: ghcr.io
3731
username: ${{ github.actor }}
3832
password: ${{ secrets.GITHUB_TOKEN }}
3933

40-
- name: Build and push multi-arch image
34+
- name: Build and push Docker image
4135
run: |
42-
docker buildx build \
43-
--platform linux/amd64,linux/arm64 \
44-
--push \
36+
docker build \
4537
-t ghcr.io/${{ github.repository_owner }}/core-api:latest \
4638
./apps/api
39+
docker push ghcr.io/${{ github.repository_owner }}/core-api:latest
4740
4841
run-migrations:
4942
name: Run Goose Migrations
@@ -71,20 +64,15 @@ jobs:
7164
- name: SSH proxy commmand
7265
uses: appleboy/ssh-action@v1
7366
with:
74-
host: ${{ secrets.SSH_HOST_SWAMPHACKS }}
75-
username: ${{ secrets.SSH_USERNAME_SWAMPHACKS }}
76-
key: ${{ secrets.SSH_KEY_SWAMPHACKS }}
77-
port: ${{ secrets.SSH_PORT_SWAMPHACKS }}
78-
proxy_host: ${{ secrets.SSH_HOST_JUMP }}
79-
proxy_username: ${{ secrets.SSH_USERNAME_JUMP }}
80-
proxy_key: ${{ secrets.SSH_KEY_JUMP }}
81-
proxy_port: ${{ secrets.SSH_PORT_JUMP }}
67+
host: ${{ secrets.API_HOST }}
68+
username: root
69+
password: ${{ secrets.API_PASSWORD }}
8270
script: |
83-
cd /home/admin/core/infra
71+
cd /root/core/infra
8472
git fetch
8573
git checkout master
8674
git reset --hard origin/master
8775
git pull
8876
infisical export --env=prod --format=dotenv --path="/api" --projectId=${{ secrets.INFISICAL_PROJECT_ID }} > ./secrets/.env.api
89-
docker compose pull api
90-
docker compose up -d --no-deps --force-recreate api
77+
docker compose -f docker-compose.api.yml pull api
78+
docker compose -f docker-compose.api.yml up -d --no-deps --force-recreate api

‎.github/workflows/prod-build-deploy-email-worker.yml‎

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- main
77
paths:
88
- 'apps/api/**'
9-
- 'infra/docker-compose.yml'
9+
- 'infra/docker-compose.api.yml'
1010
workflow_dispatch:
1111

1212
permissions:
@@ -22,28 +22,21 @@ jobs:
2222
- name: Checkout repository
2323
uses: actions/checkout@v4
2424

25-
- name: Set up QEMU for cross-platform builds
26-
uses: docker/setup-qemu-action@v2
27-
28-
- name: Set up Docker Buildx
29-
uses: docker/setup-buildx-action@v2
30-
3125
- name: Log in to GitHub Container Registry
3226
uses: docker/login-action@v2
3327
with:
3428
registry: ghcr.io
3529
username: ${{ github.actor }}
3630
password: ${{ secrets.GITHUB_TOKEN }}
3731

38-
- name: Build and push multi-arch image
32+
- name: Build and push Docker image
3933
run: |
40-
docker buildx build \
41-
--platform linux/amd64,linux/arm64 \
34+
docker build \
4235
--target prod \
43-
--push \
4436
-f ./apps/api/cmd/email_worker/Dockerfile \
4537
-t ghcr.io/${{ github.repository_owner }}/core-email-worker:latest \
4638
./apps/api
39+
docker push ghcr.io/${{ github.repository_owner }}/core-email-worker:latest
4740
4841
run-migrations:
4942
name: Run Goose Migrations
@@ -71,20 +64,15 @@ jobs:
7164
- name: SSH proxy commmand
7265
uses: appleboy/ssh-action@v1
7366
with:
74-
host: ${{ secrets.SSH_HOST_SWAMPHACKS }}
75-
username: ${{ secrets.SSH_USERNAME_SWAMPHACKS }}
76-
key: ${{ secrets.SSH_KEY_SWAMPHACKS }}
77-
port: ${{ secrets.SSH_PORT_SWAMPHACKS }}
78-
proxy_host: ${{ secrets.SSH_HOST_JUMP }}
79-
proxy_username: ${{ secrets.SSH_USERNAME_JUMP }}
80-
proxy_key: ${{ secrets.SSH_KEY_JUMP }}
81-
proxy_port: ${{ secrets.SSH_PORT_JUMP }}
67+
host: ${{ secrets.API_HOST }}
68+
username: root
69+
password: ${{ secrets.API_PASSWORD }}
8270
script: |
83-
cd /home/admin/core/infra
71+
cd /root/core/infra
8472
git fetch
8573
git checkout main
8674
git reset --hard origin/main
8775
git pull
8876
infisical export --env=prod --format=dotenv --path="/api" --projectId=${{ secrets.INFISICAL_PROJECT_ID }} > ./secrets/.env.api
89-
docker compose pull email-worker
90-
docker compose up -d --no-deps --force-recreate email-worker
77+
docker compose -f docker-compose.api.yml pull email-worker
78+
docker compose -f docker-compose.api.yml up -d --no-deps --force-recreate email-worker

0 commit comments

Comments
 (0)