diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index 3bbe72a..5063fb5 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -15,6 +15,7 @@ env: GIT_SSL_NO_VERIFY: "true" REGISTRY_HOST: 192.168.3.80 DEPLOY_REGISTRY_HOST: 10.0.0.4 + DEPLOY_SSH_HOST: 10.0.0.1 DOCKERFILE_PATH: Dockerfile.production DOCKER_PLATFORM: linux/amd64 DEPLOY_ROOT: /opt/rentaldrivego @@ -124,11 +125,11 @@ jobs: env: VPS_HOST: ${{ secrets.VPS_IP }} run: | - VPS_HOST="${VPS_HOST:-${DEPLOY_REGISTRY_HOST:-10.0.0.4}}" + VPS_HOST="${VPS_HOST:-$DEPLOY_SSH_HOST}" if [ -z "${{ secrets.VPS_SSH_KEY }}" ] || \ [ -z "$VPS_HOST" ] || \ [ -z "${{ secrets.VPS_USER }}" ]; then - echo "::error::VPS_SSH_KEY, VPS_USER, and either VPS_IP or DEPLOY_REGISTRY_HOST are required to build on the remote Docker host" + echo "::error::VPS_SSH_KEY, VPS_USER, and either VPS_IP or DEPLOY_SSH_HOST are required to build on the remote Docker host" exit 1 fi @@ -143,7 +144,7 @@ jobs: env: VPS_HOST: ${{ secrets.VPS_IP }} run: | - VPS_HOST="${VPS_HOST:-${DEPLOY_REGISTRY_HOST:-10.0.0.4}}" + VPS_HOST="${VPS_HOST:-$DEPLOY_SSH_HOST}" echo "Using SSH host $VPS_HOST" mkdir -p ~/.ssh && chmod 700 ~/.ssh echo "${{ secrets.VPS_SSH_KEY }}" > ~/.ssh/id_rsa @@ -157,7 +158,7 @@ jobs: REMOTE_BUILD_DIR: ${{ env.DEPLOY_ROOT }}/build-context VPS_HOST: ${{ secrets.VPS_IP }} run: | - VPS_HOST="${VPS_HOST:-${DEPLOY_REGISTRY_HOST:-10.0.0.4}}" + VPS_HOST="${VPS_HOST:-$DEPLOY_SSH_HOST}" SSH_OPTIONS="-o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=$HOME/.ssh/known_hosts" ssh $SSH_OPTIONS "${{ secrets.VPS_USER }}@$VPS_HOST" \ "rm -rf '$REMOTE_BUILD_DIR' && mkdir -p '$REMOTE_BUILD_DIR'" @@ -186,7 +187,7 @@ jobs: REMOTE_BUILD_DIR: ${{ env.DEPLOY_ROOT }}/build-context VPS_HOST: ${{ secrets.VPS_IP }} run: | - VPS_HOST="${VPS_HOST:-${DEPLOY_REGISTRY_HOST:-10.0.0.4}}" + VPS_HOST="${VPS_HOST:-$DEPLOY_SSH_HOST}" SSH_OPTIONS="-o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=$HOME/.ssh/known_hosts" REGISTRY_PASSWORD_B64="$(printf '%s' "$REGISTRY_PASSWORD" | base64 | tr -d '\n')" ssh $SSH_OPTIONS "${{ secrets.VPS_USER }}@$VPS_HOST" " @@ -275,7 +276,7 @@ jobs: env: VPS_HOST: ${{ secrets.VPS_IP }} run: | - VPS_HOST="${VPS_HOST:-${DEPLOY_REGISTRY_HOST:-10.0.0.4}}" + VPS_HOST="${VPS_HOST:-$DEPLOY_SSH_HOST}" if [ -z "${{ secrets.VPS_SSH_KEY }}" ] || \ [ -z "$VPS_HOST" ] || \ [ -z "${{ secrets.VPS_USER }}" ]; then @@ -298,7 +299,7 @@ jobs: env: VPS_HOST: ${{ secrets.VPS_IP }} run: | - VPS_HOST="${VPS_HOST:-${DEPLOY_REGISTRY_HOST:-10.0.0.4}}" + VPS_HOST="${VPS_HOST:-$DEPLOY_SSH_HOST}" echo "Using SSH host $VPS_HOST" mkdir -p ~/.ssh && chmod 700 ~/.ssh echo "${{ secrets.VPS_SSH_KEY }}" > ~/.ssh/id_rsa @@ -312,7 +313,7 @@ jobs: env: VPS_HOST: ${{ secrets.VPS_IP }} run: | - VPS_HOST="${VPS_HOST:-${DEPLOY_REGISTRY_HOST:-10.0.0.4}}" + VPS_HOST="${VPS_HOST:-$DEPLOY_SSH_HOST}" SSH_OPTIONS="-o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=$HOME/.ssh/known_hosts" ssh $SSH_OPTIONS "${{ secrets.VPS_USER }}@$VPS_HOST" \ "mkdir -p '$DEPLOY_ROOT/scripts' '$DEPLOY_ROOT/docker/pgmanage' '$DEPLOY_ROOT/docker/registry/auth' '$DEPLOY_ROOT/dynamic'" @@ -335,7 +336,7 @@ jobs: env: VPS_HOST: ${{ secrets.VPS_IP }} run: | - VPS_HOST="${VPS_HOST:-${DEPLOY_REGISTRY_HOST:-10.0.0.4}}" + VPS_HOST="${VPS_HOST:-$DEPLOY_SSH_HOST}" SSH_OPTIONS="-o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=$HOME/.ssh/known_hosts" REGISTRY_PASSWORD_B64="$(printf '%s' "${{ secrets.REGISTRY_PASSWORD }}" | base64 | tr -d '\n')" ssh $SSH_OPTIONS "${{ secrets.VPS_USER }}@$VPS_HOST" "