@@ -67,21 +67,23 @@ jobs:
6767 echo "SERVER_HOST=${{ vars.DEV_SERVER_HOST }}" >> $GITHUB_ENV
6868 echo "SERVER_USER=${{ vars.DEV_SERVER_USER }}" >> $GITHUB_ENV
6969 echo "DEPLOY_PATH=${{ vars.DEV_DEPLOY_PATH }}" >> $GITHUB_ENV
70+ echo "KEY_PATH=/home/ubuntu/.ssh/id_ed25519_github" >> $GITHUB_ENV
7071 else
7172 echo "ENVIRONMENT=prod" >> $GITHUB_ENV
7273 echo "COMPOSE_FILE=docker-compose-prod.yml" >> $GITHUB_ENV
7374 echo "NGINX_FILE=nginx-prod.conf" >> $GITHUB_ENV
7475 echo "SERVER_HOST=${{ vars.PROD_SERVER_HOST }}" >> $GITHUB_ENV
7576 echo "SERVER_USER=${{ vars.PROD_SERVER_USER }}" >> $GITHUB_ENV
7677 echo "DEPLOY_PATH=${{ vars.PROD_DEPLOY_PATH }}" >> $GITHUB_ENV
78+ echo "KEY_PATH=/home/ubuntu/.ssh/id_ed25519_github_prod" >> $GITHUB_ENV
7779 fi
7880
7981 - name : Copy docker-compose file to server
80828183 with :
8284 host : ${{ env.SERVER_HOST }}
8385 username : ${{ env.SERVER_USER }}
84- key_path : " /home/ubuntu/.ssh/id_ed25519_github ${{startsWith(github.ref_name, 'dev-') && '' || '_prod'}} "
86+ key_path : ${{ env.KEY_PATH }}
8587 source : " deploy/${{ env.COMPOSE_FILE }}"
8688 target : ${{ env.DEPLOY_PATH }}
8789
9092 with :
9193 host : ${{ env.SERVER_HOST }}
9294 username : ${{ env.SERVER_USER }}
93- key_path : " /home/ubuntu/.ssh/id_ed25519_github ${{startsWith(github.ref_name, 'dev-') && '' || '_prod'}} "
95+ key_path : ${{ env.KEY_PATH }}
9496 source : " deploy/${{ env.NGINX_FILE }}"
9597 target : ${{ env.DEPLOY_PATH }}
9698
99101 with :
100102 host : ${{ env.SERVER_HOST }}
101103 username : ${{ env.SERVER_USER }}
102- key_path : " /home/ubuntu/.ssh/id_ed25519_github ${{startsWith(github.ref_name, 'dev-') && '' || '_prod'}} "
104+ key_path : ${{ env.KEY_PATH }}
103105 script : |
104106 cd ${{ env.DEPLOY_PATH }}
105107 mv deploy/${{ env.COMPOSE_FILE }} ./docker-compose.yml
@@ -109,7 +111,7 @@ jobs:
109111 with :
110112 host : ${{ env.SERVER_HOST }}
111113 username : ${{ env.SERVER_USER }}
112- key_path : " /home/ubuntu/.ssh/id_ed25519_github ${{startsWith(github.ref_name, 'dev-') && '' || '_prod'}} "
114+ key_path : ${{ env.KEY_PATH }}
113115 script : |
114116 cd ${{ env.DEPLOY_PATH }}
115117 mv deploy/${{ env.NGINX_FILE }} ./nginx.conf
@@ -131,11 +133,13 @@ jobs:
131133 echo "SERVER_HOST=${{ vars.DEV_SERVER_HOST }}" >> $GITHUB_ENV
132134 echo "SERVER_USER=${{ vars.DEV_SERVER_USER }}" >> $GITHUB_ENV
133135 echo "DEPLOY_PATH=${{ vars.DEV_DEPLOY_PATH }}" >> $GITHUB_ENV
136+ echo "KEY_PATH=/home/ubuntu/.ssh/id_ed25519_github" >> $GITHUB_ENV
134137 else
135138 echo "ENVIRONMENT=prod" >> $GITHUB_ENV
136139 echo "SERVER_HOST=${{ vars.PROD_SERVER_HOST }}" >> $GITHUB_ENV
137140 echo "SERVER_USER=${{ vars.PROD_SERVER_USER }}" >> $GITHUB_ENV
138141 echo "DEPLOY_PATH=${{ vars.PROD_DEPLOY_PATH }}" >> $GITHUB_ENV
142+ echo "KEY_PATH=/home/ubuntu/.ssh/id_ed25519_github_prod" >> $GITHUB_ENV
139143 fi
140144 echo "IMAGE_TAG=${{ github.ref_name }}" >> $GITHUB_ENV
141145 echo "IMAGE_URI=${{ needs.build-and-push.outputs.image-uri }}" >> $GITHUB_ENV
@@ -156,7 +160,7 @@ jobs:
156160 with :
157161 host : ${{ env.SERVER_HOST }}
158162 username : ${{ env.SERVER_USER }}
159- key_path : " /home/ubuntu/.ssh/id_ed25519_github ${{startsWith(github.ref_name, 'dev-') && '' || '_prod'}} "
163+ key_path : ${{ env.KEY_PATH }}
160164 script : |
161165 cd ${{ env.DEPLOY_PATH }}
162166
0 commit comments