Skip to content

Commit 7266dbc

Browse files
AlexanderWangYAlexanderWangY
authored
Merge pull request #174 from swamphacks/fix/infisical-secrets
fix: use shell env instead
2 parents 3fbad30 + e5d77ea commit 7266dbc

6 files changed

Lines changed: 19 additions & 43 deletions

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,6 @@ jobs:
6060

6161
steps:
6262
- name: SSH proxy commmand
63-
env:
64-
INFISICAL_CLIENT_ID: ${{ secrets.INFISICAL_CLIENT_ID }}
65-
INFISICAL_CLIENT_SECRET: ${{ secrets.INFISICAL_CLIENT_SECRET }}
66-
INFISICAL_PROJECT_ID: ${{ secrets.INFISICAL_PROJECT_ID }}
6763
uses: appleboy/ssh-action@v1
6864
with:
6965
host: ${{ secrets.API_HOST}}
@@ -78,8 +74,8 @@ jobs:
7874
7975
export INFISICAL_TOKEN=$(infisical login \
8076
--method=universal-auth \
81-
--client-id=${INFISICAL_CLIENT_ID} \
82-
--client-secret=${INFISICAL_CLIENT_SECRET} \
77+
--client-id='${{ secrets.INFISICAL_CLIENT_ID }}' \
78+
--client-secret='${{ secrets.INFISICAL_CLIENT_SECRET }}' \
8379
--silent \
8480
--plain)
8581
@@ -88,7 +84,7 @@ jobs:
8884
--env=dev \
8985
--format=dotenv \
9086
--path="/api" \
91-
--projectId=$INFISICAL_PROJECT_ID \
87+
--projectId='${{ secrets.INFISICAL_PROJECT_ID }}' \
9288
> ./secrets/.env.dev.api
9389
9490
docker compose -f docker-compose.api.yml pull api-dev

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@ jobs:
6262

6363
steps:
6464
- name: SSH proxy commmand
65-
env:
66-
INFISICAL_CLIENT_ID: ${{ secrets.INFISICAL_CLIENT_ID }}
67-
INFISICAL_CLIENT_SECRET: ${{ secrets.INFISICAL_CLIENT_SECRET }}
68-
INFISICAL_PROJECT_ID: ${{ secrets.INFISICAL_PROJECT_ID }}
6965
uses: appleboy/ssh-action@v1
7066
with:
7167
host: ${{ secrets.API_HOST }}
@@ -80,8 +76,8 @@ jobs:
8076
8177
export INFISICAL_TOKEN=$(infisical login \
8278
--method=universal-auth \
83-
--client-id=${INFISICAL_CLIENT_ID} \
84-
--client-secret=${INFISICAL_CLIENT_SECRET} \
79+
--client-id='${{ secrets.INFISICAL_CLIENT_ID }}' \
80+
--client-secret='${{ secrets.INFISICAL_CLIENT_SECRET }}' \
8581
--silent \
8682
--plain)
8783
@@ -90,7 +86,7 @@ jobs:
9086
--env=dev \
9187
--format=dotenv \
9288
--path="/api" \
93-
--projectId=$INFISICAL_PROJECT_ID \
89+
--projectId='${{ secrets.INFISICAL_PROJECT_ID }}' \
9490
> ./secrets/.env.dev.api
9591
9692
docker compose -f docker-compose.api.yml pull email-worker-dev

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ jobs:
4949
steps:
5050
- name: SSH proxy commmand
5151
uses: appleboy/ssh-action@v1
52-
env:
53-
INFISICAL_CLIENT_ID: ${{ secrets.INFISICAL_CLIENT_ID }}
54-
INFISICAL_CLIENT_SECRET: ${{ secrets.INFISICAL_CLIENT_SECRET }}
55-
INFISICAL_PROJECT_ID: ${{ secrets.INFISICAL_PROJECT_ID }}
5652
with:
5753
host: ${{ secrets.WEB_HOST }}
5854
username: root
@@ -66,8 +62,8 @@ jobs:
6662
6763
export INFISICAL_TOKEN=$(infisical login \
6864
--method=universal-auth \
69-
--client-id=${INFISICAL_CLIENT_ID} \
70-
--client-secret=${INFISICAL_CLIENT_SECRET} \
65+
--client-id='${{ secrets.INFISICAL_CLIENT_ID }}' \
66+
--client-secret='${{ secrets.INFISICAL_CLIENT_SECRET }}' \
7167
--silent \
7268
--plain)
7369
@@ -76,8 +72,8 @@ jobs:
7672
--env=dev \
7773
--format=dotenv \
7874
--path="/web" \
79-
--projectId=$INFISICAL_PROJECT_ID \
80-
> ./secrets/.env.dev.web
75+
--projectId='${{ secrets.INFISICAL_PROJECT_ID }}' \
76+
> ./secrets/.env.dev.web
8177
8278
docker compose -f docker-compose.web.yml pull web-dev
8379
docker compose -f docker-compose.web.yml up -d --no-deps --force-recreate web-dev

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@ jobs:
6262

6363
steps:
6464
- name: SSH proxy commmand
65-
env:
66-
INFISICAL_CLIENT_ID: ${{ secrets.INFISICAL_CLIENT_ID }}
67-
INFISICAL_CLIENT_SECRET: ${{ secrets.INFISICAL_CLIENT_SECRET }}
68-
INFISICAL_PROJECT_ID: ${{ secrets.INFISICAL_PROJECT_ID }}
6965
uses: appleboy/ssh-action@v1
7066
with:
7167
host: ${{ secrets.API_HOST }}
@@ -80,8 +76,8 @@ jobs:
8076
8177
export INFISICAL_TOKEN=$(infisical login \
8278
--method=universal-auth \
83-
--client-id=${INFISICAL_CLIENT_ID} \
84-
--client-secret=${INFISICAL_CLIENT_SECRET} \
79+
--client-id='${{ secrets.INFISICAL_CLIENT_ID }}' \
80+
--client-secret='${{ secrets.INFISICAL_CLIENT_SECRET }}' \
8581
--silent \
8682
--plain)
8783
@@ -90,7 +86,7 @@ jobs:
9086
--env=prod \
9187
--format=dotenv \
9288
--path="/api" \
93-
--projectId=$INFISICAL_PROJECT_ID \
89+
--projectId='${{ secrets.INFISICAL_PROJECT_ID }}' \
9490
> ./secrets/.env.api
9591
9692
docker compose -f docker-compose.api.yml pull api

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@ jobs:
6262

6363
steps:
6464
- name: SSH proxy commmand
65-
env:
66-
INFISICAL_CLIENT_ID: ${{ secrets.INFISICAL_CLIENT_ID }}
67-
INFISICAL_CLIENT_SECRET: ${{ secrets.INFISICAL_CLIENT_SECRET }}
68-
INFISICAL_PROJECT_ID: ${{ secrets.INFISICAL_PROJECT_ID }}
6965
uses: appleboy/ssh-action@v1
7066
with:
7167
host: ${{ secrets.API_HOST }}
@@ -80,8 +76,8 @@ jobs:
8076
8177
export INFISICAL_TOKEN=$(infisical login \
8278
--method=universal-auth \
83-
--client-id=${INFISICAL_CLIENT_ID} \
84-
--client-secret=${INFISICAL_CLIENT_SECRET} \
79+
--client-id='${{ secrets.INFISICAL_CLIENT_ID }}' \
80+
--client-secret='${{ secrets.INFISICAL_CLIENT_SECRET }}' \
8581
--silent \
8682
--plain)
8783
@@ -90,7 +86,7 @@ jobs:
9086
--env=prod \
9187
--format=dotenv \
9288
--path="/api" \
93-
--projectId=$INFISICAL_PROJECT_ID \
89+
--projectId='${{ secrets.INFISICAL_PROJECT_ID }}' \
9490
> ./secrets/.env.api
9591
9692
docker compose -f docker-compose.api.yml pull email-worker

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ jobs:
4949

5050
steps:
5151
- name: SSH proxy commmand
52-
env:
53-
INFISICAL_CLIENT_ID: ${{ secrets.INFISICAL_CLIENT_ID }}
54-
INFISICAL_CLIENT_SECRET: ${{ secrets.INFISICAL_CLIENT_SECRET }}
55-
INFISICAL_PROJECT_ID: ${{ secrets.INFISICAL_PROJECT_ID }}
5652
uses: appleboy/ssh-action@v1
5753
with:
5854
host: ${{ secrets.WEB_HOST }}
@@ -67,8 +63,8 @@ jobs:
6763
6864
export INFISICAL_TOKEN=$(infisical login \
6965
--method=universal-auth \
70-
--client-id=${INFISICAL_CLIENT_ID} \
71-
--client-secret=${INFISICAL_CLIENT_SECRET} \
66+
--client-id='${{ secrets.INFISICAL_CLIENT_ID }}' \
67+
--client-secret='${{ secrets.INFISICAL_CLIENT_SECRET }}' \
7268
--silent \
7369
--plain)
7470
@@ -77,7 +73,7 @@ jobs:
7773
--env=prod \
7874
--format=dotenv \
7975
--path="/web" \
80-
--projectId=$INFISICAL_PROJECT_ID \
76+
--projectId='${{ secrets.INFISICAL_PROJECT_ID }}' \
8177
> ./secrets/.env.web
8278
8379
docker compose -f docker-compose.web.yml pull web

0 commit comments

Comments
 (0)