Skip to content

Commit e4999ac

Browse files
committed
chore: fix deploy configuration
1 parent 0f5b8ca commit e4999ac

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

.github/workflows/container-deploy.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
echo "SSH_PROXY_HOST=ovh1.openfoodfacts.org" >> $GITHUB_ENV
2525
echo "SSH_USERNAME=off" >> $GITHUB_ENV
2626
echo "SSH_HOST=10.1.0.200" >> $GITHUB_ENV
27+
echo "SSH_PROTOCOL=tcp" >> $GITHUB_ENV
2728
echo "ROBOTOFF_INSTANCE=dev" >> $GITHUB_ENV
2829
echo "ROBOTOFF_TLD=net" >> $GITHUB_ENV
2930
echo "MONGO_URI=mongodb://10.1.0.200:27017" >> $GITHUB_ENV
@@ -38,9 +39,11 @@ jobs:
3839
- name: Set various variable for production deployment
3940
if: matrix.env == 'robotoff-org'
4041
run: |
41-
# First connect on the SSH proxy, using ipv6 address
42-
echo "SSH_PROXY_HOST=osm45.openstreetmap.fr" >> $GITHUB_ENV
43-
echo "SSH_USERNAME=off" >> $GITHUB_ENV
42+
# This is the OSM proxy server, that does have an ipv4 address
43+
echo "SSH_PROXY_HOST=45.147.209.254" >> $GITHUB_ENV
44+
# We use 'raphael' user as we don't have an off user yet on the proxy machine
45+
echo "SSH_USERNAME=raphael" >> $GITHUB_ENV
46+
echo "SSH_PROTOCOL=tcp" >> $GITHUB_ENV
4447
echo "SSH_HOST=10.3.0.200" >> $GITHUB_ENV
4548
echo "ROBOTOFF_INSTANCE=prod" >> $GITHUB_ENV
4649
echo "ROBOTOFF_TLD=org" >> $GITHUB_ENV
@@ -81,6 +84,7 @@ jobs:
8184
proxy_host: ${{ env.SSH_PROXY_HOST }}
8285
proxy_username: ${{ env.SSH_USERNAME }}
8386
proxy_key: ${{ secrets.SSH_PRIVATE_KEY }}
87+
protocol: ${{ env.SSH_PROTOCOL }}
8488
script_stop: false
8589
script: |
8690
# Clone Git repository if not already there
@@ -111,6 +115,7 @@ jobs:
111115
proxy_host: ${{ env.SSH_PROXY_HOST }}
112116
proxy_username: ${{ env.SSH_USERNAME }}
113117
proxy_key: ${{ secrets.SSH_PRIVATE_KEY }}
118+
protocol: ${{ env.SSH_PROTOCOL }}
114119
script_stop: false
115120
script: |
116121
# Go to repository directory
@@ -177,6 +182,7 @@ jobs:
177182
proxy_host: ${{ env.SSH_PROXY_HOST }}
178183
proxy_username: ${{ env.SSH_USERNAME }}
179184
proxy_key: ${{ secrets.SSH_PRIVATE_KEY }}
185+
protocol: ${{ env.SSH_PROTOCOL }}
180186
script_stop: false
181187
script: |
182188
cd ${{ matrix.env }}
@@ -194,6 +200,7 @@ jobs:
194200
proxy_host: ${{ env.SSH_PROXY_HOST }}
195201
proxy_username: ${{ env.SSH_USERNAME }}
196202
proxy_key: ${{ secrets.SSH_PRIVATE_KEY }}
203+
protocol: ${{ env.SSH_PROTOCOL }}
197204
envs: DOCKER_CLIENT_TIMEOUT,COMPOSE_HTTP_TIMEOUT
198205
script_stop: false
199206
script: |
@@ -216,6 +223,7 @@ jobs:
216223
proxy_host: ${{ env.SSH_PROXY_HOST }}
217224
proxy_username: ${{ env.SSH_USERNAME }}
218225
proxy_key: ${{ secrets.SSH_PRIVATE_KEY }}
226+
protocol: ${{ env.SSH_PROTOCOL }}
219227
script_stop: false
220228
script: |
221229
cd ${{ matrix.env}}
@@ -237,6 +245,7 @@ jobs:
237245
proxy_host: ${{ env.SSH_PROXY_HOST }}
238246
proxy_username: ${{ env.SSH_USERNAME }}
239247
proxy_key: ${{ secrets.SSH_PRIVATE_KEY }}
248+
protocol: ${{ env.SSH_PROTOCOL }}
240249
envs: DOCKER_CLIENT_TIMEOUT,COMPOSE_HTTP_TIMEOUT
241250
script_stop: false
242251
script: |
@@ -253,6 +262,7 @@ jobs:
253262
proxy_host: ${{ env.SSH_PROXY_HOST }}
254263
proxy_username: ${{ env.SSH_USERNAME }}
255264
proxy_key: ${{ secrets.SSH_PRIVATE_KEY }}
265+
protocol: ${{ env.SSH_PROTOCOL }}
256266
script_stop: false
257267
script: |
258268
cd ${{ matrix.env }}

0 commit comments

Comments
 (0)