From d4697987ebdd3e38288b88c565aa325a95e3d6c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Bournhonesque?= Date: Wed, 21 Aug 2024 09:25:00 +0200 Subject: [PATCH] chore: update proxy_username in container-deploy.yml --- .github/workflows/container-deploy.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/container-deploy.yml b/.github/workflows/container-deploy.yml index 89673f3a31..16ecd30f41 100644 --- a/.github/workflows/container-deploy.yml +++ b/.github/workflows/container-deploy.yml @@ -23,6 +23,7 @@ jobs: run: | echo "SSH_PROXY_HOST=ovh1.openfoodfacts.org" >> $GITHUB_ENV echo "SSH_USERNAME=off" >> $GITHUB_ENV + echo "SSH_PROXY_USERNAME=off" >> $GITHUB_ENV echo "SSH_HOST=10.1.0.200" >> $GITHUB_ENV echo "SSH_PROTOCOL=tcp" >> $GITHUB_ENV echo "ROBOTOFF_INSTANCE=dev" >> $GITHUB_ENV @@ -41,8 +42,9 @@ jobs: run: | # This is the OSM proxy server, that does have an ipv4 address echo "SSH_PROXY_HOST=45.147.209.254" >> $GITHUB_ENV + echo "SSH_USERNAME=off" >> $GITHUB_ENV # We use 'raphael' user as we don't have an off user yet on the proxy machine - echo "SSH_USERNAME=raphael" >> $GITHUB_ENV + echo "SSH_PROXY_USERNAME=raphael" >> $GITHUB_ENV echo "SSH_PROTOCOL=tcp" >> $GITHUB_ENV echo "SSH_HOST=10.3.0.200" >> $GITHUB_ENV echo "ROBOTOFF_INSTANCE=prod" >> $GITHUB_ENV @@ -82,7 +84,7 @@ jobs: username: ${{ env.SSH_USERNAME }} key: ${{ secrets.SSH_PRIVATE_KEY }} proxy_host: ${{ env.SSH_PROXY_HOST }} - proxy_username: ${{ env.SSH_USERNAME }} + proxy_username: ${{ env.SSH_PROXY_USERNAME }} proxy_key: ${{ secrets.SSH_PRIVATE_KEY }} protocol: ${{ env.SSH_PROTOCOL }} script_stop: false @@ -113,7 +115,7 @@ jobs: username: ${{ env.SSH_USERNAME }} key: ${{ secrets.SSH_PRIVATE_KEY }} proxy_host: ${{ env.SSH_PROXY_HOST }} - proxy_username: ${{ env.SSH_USERNAME }} + proxy_username: ${{ env.SSH_PROXY_USERNAME }} proxy_key: ${{ secrets.SSH_PRIVATE_KEY }} protocol: ${{ env.SSH_PROTOCOL }} script_stop: false @@ -180,7 +182,7 @@ jobs: username: ${{ env.SSH_USERNAME }} key: ${{ secrets.SSH_PRIVATE_KEY }} proxy_host: ${{ env.SSH_PROXY_HOST }} - proxy_username: ${{ env.SSH_USERNAME }} + proxy_username: ${{ env.SSH_PROXY_USERNAME }} proxy_key: ${{ secrets.SSH_PRIVATE_KEY }} protocol: ${{ env.SSH_PROTOCOL }} script_stop: false @@ -198,7 +200,7 @@ jobs: username: ${{ env.SSH_USERNAME }} key: ${{ secrets.SSH_PRIVATE_KEY }} proxy_host: ${{ env.SSH_PROXY_HOST }} - proxy_username: ${{ env.SSH_USERNAME }} + proxy_username: ${{ env.SSH_PROXY_USERNAME }} proxy_key: ${{ secrets.SSH_PRIVATE_KEY }} protocol: ${{ env.SSH_PROTOCOL }} envs: DOCKER_CLIENT_TIMEOUT,COMPOSE_HTTP_TIMEOUT @@ -221,7 +223,7 @@ jobs: username: ${{ env.SSH_USERNAME }} key: ${{ secrets.SSH_PRIVATE_KEY }} proxy_host: ${{ env.SSH_PROXY_HOST }} - proxy_username: ${{ env.SSH_USERNAME }} + proxy_username: ${{ env.SSH_PROXY_USERNAME }} proxy_key: ${{ secrets.SSH_PRIVATE_KEY }} protocol: ${{ env.SSH_PROTOCOL }} script_stop: false @@ -243,7 +245,7 @@ jobs: username: ${{ env.SSH_USERNAME }} key: ${{ secrets.SSH_PRIVATE_KEY }} proxy_host: ${{ env.SSH_PROXY_HOST }} - proxy_username: ${{ env.SSH_USERNAME }} + proxy_username: ${{ env.SSH_PROXY_USERNAME }} proxy_key: ${{ secrets.SSH_PRIVATE_KEY }} protocol: ${{ env.SSH_PROTOCOL }} envs: DOCKER_CLIENT_TIMEOUT,COMPOSE_HTTP_TIMEOUT @@ -260,7 +262,7 @@ jobs: username: ${{ env.SSH_USERNAME }} key: ${{ secrets.SSH_PRIVATE_KEY }} proxy_host: ${{ env.SSH_PROXY_HOST }} - proxy_username: ${{ env.SSH_USERNAME }} + proxy_username: ${{ env.SSH_PROXY_USERNAME }} proxy_key: ${{ secrets.SSH_PRIVATE_KEY }} protocol: ${{ env.SSH_PROTOCOL }} script_stop: false