From 328cbb3835c2a76cc7ed50d0dbb99d8352efcaf3 Mon Sep 17 00:00:00 2001 From: skywalker Date: Thu, 29 Aug 2024 11:59:11 +0300 Subject: [PATCH] chore(dev): add `SSH_USER` and `SSH_HOST` --- .github/workflows/cicd.yml | 2 ++ tools/scripts/clean.sh | 2 +- tools/scripts/deploy.sh | 4 +++- tools/scripts/run.sh | 4 +++- tools/scripts/stop.sh | 4 +++- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index d8c73c07..47451719 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -208,6 +208,8 @@ jobs: - name: Deploy at home lab run: echo "$(pwd)" && ./tools/scripts/deploy.sh dev env: + SSH_USER: ${{ secrets.SSH_USER }} + SSH_HOST: ${{ secrets.SSH_HOST }} MUSE_DOCKER_DEFAULT_CONTEXT: default MUSE_JWT_SECRET_KEY: ${{ secrets.MUSE_JWT_SECRET_KEY }} CI: false # https://stackoverflow.com/questions/34917977/disable-npm-warnings-as-errors-build-definition-tfs diff --git a/tools/scripts/clean.sh b/tools/scripts/clean.sh index 39e6e99f..7a50f618 100755 --- a/tools/scripts/clean.sh +++ b/tools/scripts/clean.sh @@ -26,7 +26,7 @@ docker context use "${MUSE_DOCKER_DEFAULT_CONTEXT}" if [ "$stage" != "local" ]; then context_name=muse-deploy-server if ! docker context ls --format '{{.Name}}' | grep -q "^${context_name}$"; then - docker context create "${context_name}" --description "[MUSE] Deploy Server" --docker "host=ssh://kiryuxa@88.201.171.120" + docker context create "${context_name}" --description "[MUSE] Deploy Server" --docker "host=ssh://${SSH_USER}@${SSH_HOST}" fi docker context use muse-deploy-server diff --git a/tools/scripts/deploy.sh b/tools/scripts/deploy.sh index aa983948..df5c8e32 100755 --- a/tools/scripts/deploy.sh +++ b/tools/scripts/deploy.sh @@ -5,6 +5,8 @@ rootDir="$currentDir/../../" [[ -z "${MUSE_DOCKER_DEFAULT_CONTEXT}" ]] && { echo "'MUSE_DOCKER_DEFAULT_CONTEXT' is not set. Exiting."; exit 1; } [[ -z "${MUSE_JWT_SECRET_KEY}" ]] && { echo "'MUSE_JWT_SECRET_KEY' is not set. Exiting."; exit 1; } +[[ -z "${SSH_USER}" ]] && { echo "'SSH_USER' is not set. Exiting."; exit 1; } +[[ -z "${SSH_HOST}" ]] && { echo "'SSH_HOST' is not set. Exiting."; exit 1; } trap 'docker context use "${MUSE_DOCKER_DEFAULT_CONTEXT}"' EXIT @@ -32,7 +34,7 @@ fi if [ "$stage" != "local" ]; then context_name=muse-$stage if ! docker context ls --format '{{.Name}}' | grep -q "^${context_name}$"; then - docker context create "${context_name}" --description "[MUSE] '$stage' Deploy Server" --docker "host=ssh://kiryuxa@kiryuxa.com" + docker context create "${context_name}" --description "[MUSE] '$stage' Deploy Server" --docker "host=ssh://${SSH_USER}@${SSH_HOST}" fi docker context use "$context_name" diff --git a/tools/scripts/run.sh b/tools/scripts/run.sh index 74084006..8cf31177 100755 --- a/tools/scripts/run.sh +++ b/tools/scripts/run.sh @@ -5,6 +5,8 @@ rootDir="$currentDir/../../" [[ -z "${MUSE_DOCKER_DEFAULT_CONTEXT}" ]] && { echo "'MUSE_DOCKER_DEFAULT_CONTEXT' is not set. Exiting."; exit 1; } [[ -z "${MUSE_JWT_SECRET_KEY}" ]] && { echo "'MUSE_JWT_SECRET_KEY' is not set. Exiting."; exit 1; } +[[ -z "${SSH_USER}" ]] && { echo "'SSH_USER' is not set. Exiting."; exit 1; } +[[ -z "${SSH_HOST}" ]] && { echo "'SSH_HOST' is not set. Exiting."; exit 1; } trap 'docker context use "${MUSE_DOCKER_DEFAULT_CONTEXT}"' EXIT @@ -27,7 +29,7 @@ docker context use "${MUSE_DOCKER_DEFAULT_CONTEXT}" if [ "$stage" != "local" ]; then context_name=muse-$stage if ! docker context ls --format '{{.Name}}' | grep -q "^${context_name}$"; then - docker context create "${context_name}" --description "[MUSE $stage] Deploy Server" --docker "host=ssh://kiryuxa@88.201.171.120" + docker context create "${context_name}" --description "[MUSE $stage] Deploy Server" --docker "host=ssh://${SSH_USER}@${SSH_HOST}" fi docker context use "$context_name" diff --git a/tools/scripts/stop.sh b/tools/scripts/stop.sh index fabad891..7c278256 100755 --- a/tools/scripts/stop.sh +++ b/tools/scripts/stop.sh @@ -4,6 +4,8 @@ currentDir=$(cd -P -- "$(dirname -- "$0")" && pwd -P) rootDir="$currentDir/../../" [[ -z "${MUSE_DOCKER_DEFAULT_CONTEXT}" ]] && { echo "'MUSE_DOCKER_DEFAULT_CONTEXT' is not set. Exiting."; exit 1; } +[[ -z "${SSH_USER}" ]] && { echo "'SSH_USER' is not set. Exiting."; exit 1; } +[[ -z "${SSH_HOST}" ]] && { echo "'SSH_HOST' is not set. Exiting."; exit 1; } trap 'docker context use "${MUSE_DOCKER_DEFAULT_CONTEXT}"' EXIT @@ -26,7 +28,7 @@ docker context use "${MUSE_DOCKER_DEFAULT_CONTEXT}" if [ "$stage" != "local" ]; then context_name=muse-$stage if ! docker context ls --format '{{.Name}}' | grep -q "^${context_name}$"; then - docker context create "${context_name}" --description "[MUSE] '$stage' Deploy Server" --docker "host=ssh://kiryuxa@88.201.171.120" + docker context create "${context_name}" --description "[MUSE] '$stage' Deploy Server" --docker "host=ssh://${SSH_USER}@${SSH_HOST}" fi docker context use "$context_name"