Skip to content

Commit 30465b0

Browse files
authored
Revert to separate ssh definition. Reverse prod1/prod2 to debug.
1 parent 987ec9b commit 30465b0

1 file changed

Lines changed: 22 additions & 14 deletions

File tree

.github/workflows/main.yml

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,27 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@v5
13-
- name: ssh keys
13+
- name: rsync prod2
14+
uses: burnett01/rsync-deployments@7.1.0
15+
with:
16+
switches: -avzr --delete
17+
remote_path: ${{ secrets.REMOTE_PATH }}
18+
remote_host: ${{ secrets.REMOTE_HOST_2 }}
19+
remote_port: ${{ secrets.REMOTE_PORT }}
20+
remote_user: ${{ secrets.REMOTE_USER }}
21+
remote_key: ${{ secrets.REMOTE_PRIVATE_KEY }}
22+
- name: ssh prod2
1423
env:
1524
SSH_PRIVATE_KEY: ${{ secrets.REMOTE_PRIVATE_KEY }}
1625
shell: bash
1726
run: |
1827
mkdir -p ~/.ssh
1928
echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
2029
chmod 600 ~/.ssh/id_rsa
21-
ssh-keyscan -H ${{ secrets.REMOTE_HOST_1 }} >> ~/.ssh/known_hosts
2230
ssh-keyscan -H ${{ secrets.REMOTE_HOST_2 }} >> ~/.ssh/known_hosts
31+
- name: docker prod2
32+
run: |
33+
ssh ${{ secrets.REMOTE_USER }}@${{ secrets.REMOTE_HOST_2 }} "cd ${{ secrets.REMOTE_PATH }}; docker compose pull; docker compose up -d --build --force-recreate"
2334
- name: rsync prod1
2435
uses: burnett01/rsync-deployments@7.1.0
2536
with:
@@ -29,18 +40,15 @@ jobs:
2940
remote_port: ${{ secrets.REMOTE_PORT }}
3041
remote_user: ${{ secrets.REMOTE_USER }}
3142
remote_key: ${{ secrets.REMOTE_PRIVATE_KEY }}
43+
- name: ssh prod1
44+
env:
45+
SSH_PRIVATE_KEY: ${{ secrets.REMOTE_PRIVATE_KEY }}
46+
shell: bash
47+
run: |
48+
mkdir -p ~/.ssh
49+
echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
50+
chmod 600 ~/.ssh/id_rsa
51+
ssh-keyscan -H ${{ secrets.REMOTE_HOST_1 }} >> ~/.ssh/known_hosts
3252
- name: docker prod1
3353
run: |
3454
ssh ${{ secrets.REMOTE_USER }}@${{ secrets.REMOTE_HOST_1 }} "cd ${{ secrets.REMOTE_PATH }}; docker compose pull; docker compose up -d --build --force-recreate"
35-
- name: rsync prod2
36-
uses: burnett01/rsync-deployments@7.1.0
37-
with:
38-
switches: -avzr --delete
39-
remote_path: ${{ secrets.REMOTE_PATH }}
40-
remote_host: ${{ secrets.REMOTE_HOST_2 }}
41-
remote_port: ${{ secrets.REMOTE_PORT }}
42-
remote_user: ${{ secrets.REMOTE_USER }}
43-
remote_key: ${{ secrets.REMOTE_PRIVATE_KEY }}
44-
- name: docker prod2
45-
run: |
46-
ssh ${{ secrets.REMOTE_USER }}@${{ secrets.REMOTE_HOST_2 }} "cd ${{ secrets.REMOTE_PATH }}; docker compose pull; docker compose up -d --build --force-recreate"

0 commit comments

Comments
 (0)