aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralexv-smirnov <alexv-smirnov@yandex-team.ru>2022-03-18 20:57:52 +0300
committeralexv-smirnov <alexv-smirnov@yandex-team.ru>2022-03-18 20:57:52 +0300
commit639b93b1e18f29d7aa4d0ad0bafc73e75632ae3a (patch)
tree2d07f6247fc76daf4c3c3a6895fb2c6ed44fa946
parent9b37b4e5572aa1821cbc37b13780873348f5607c (diff)
downloadydb-639b93b1e18f29d7aa4d0ad0bafc73e75632ae3a.tar.gz
local binary install - use current version on binaries.ydb.tech
ref:70685c809cdc4dc33e489d2fab4238019fb51a54
-rw-r--r--ydb/deploy/local_binary/install.sh12
-rwxr-xr-xydb/deploy/local_binary/linux/start.sh6
-rw-r--r--ydb/docs/ru/core/cluster/_includes/addition_overlay.md0
-rw-r--r--ydb/docs/ru/core/cluster/index.md2
4 files changed, 15 insertions, 5 deletions
diff --git a/ydb/deploy/local_binary/install.sh b/ydb/deploy/local_binary/install.sh
index af1b495970..3d161e846a 100644
--- a/ydb/deploy/local_binary/install.sh
+++ b/ydb/deploy/local_binary/install.sh
@@ -67,9 +67,9 @@ while getopts "hi:r:na" opt ; do
done
YDB_STORAGE_URL="${YDB_STORAGE_URL:-"https://binaries.ydb.tech"}"
-YDB_VERSION="main"
-# YDB_VERSION="${YDB_VERSION:-$(curl_with_retry -s "${YDB_STORAGE_URL}/release/stable" | tr -d [:space:])}"
+YDB_VERSION="$(curl -s "${YDB_STORAGE_URL}/release/current" | tr -d [:space:])"
+echo "YDB version: $YDB_VERSION"
echo "Preparing temporary directory"
# Download to temp dir, check that executable is healthy, only then move to install path.
@@ -86,7 +86,7 @@ mkdir -p "${TMP_INSTALL_PATH}/ydbd"
echo "Downloading and extracting binary archive to temporary directory"
# Download and show progress.
-curl "${YDB_STORAGE_URL}/ydbd-${YDB_VERSION}-${GOOS}-${GOARCH}.tar.gz" | tar -xz --strip-components=1 -C "${TMP_INSTALL_PATH}/ydbd"
+curl "${YDB_STORAGE_URL}/release/${YDB_VERSION}/ydbd-${YDB_VERSION}-${GOOS}-${GOARCH}.tar.gz" | tar -xz --strip-components=1 -C "${TMP_INSTALL_PATH}/ydbd"
echo "Downloading and extracting scripts and configs to temporary directory"
curl "${YDB_STORAGE_URL}/local_scripts/${GOOS}.tar.gz" | tar -xz -C "${TMP_INSTALL_PATH}"
@@ -101,5 +101,9 @@ echo "Moving files from temporary to target directory"
mv -f "${TMP_INSTALL_PATH}"/* "${YDB}"
-echo "Installation complete. You may run 'start.sh ram' or 'start.sh disk' in the ${YDB_INSTALL_PATH} diretory to start server, stop.sh to stop."
+echo "
+Installation completed successfully.
+
+You may run 'start.sh ram' or 'start.sh disk' in the ${YDB_INSTALL_PATH} directory to start server/database, stop.sh to stop.
+"
diff --git a/ydb/deploy/local_binary/linux/start.sh b/ydb/deploy/local_binary/linux/start.sh
index d803d70ae8..efb62501fb 100755
--- a/ydb/deploy/local_binary/linux/start.sh
+++ b/ydb/deploy/local_binary/linux/start.sh
@@ -41,4 +41,8 @@ if [[ $? -eq 0 ]]; then
echo Errors found when starting database process, cancelling start script
exit
fi
-echo Database started
+echo "
+Database started. Connection options for YDB CLI:
+
+-e grpc://localhost:2136 -d /Root/test
+"
diff --git a/ydb/docs/ru/core/cluster/_includes/addition_overlay.md b/ydb/docs/ru/core/cluster/_includes/addition_overlay.md
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/ydb/docs/ru/core/cluster/_includes/addition_overlay.md
diff --git a/ydb/docs/ru/core/cluster/index.md b/ydb/docs/ru/core/cluster/index.md
index 0bcddd0849..ef81246bc5 100644
--- a/ydb/docs/ru/core/cluster/index.md
+++ b/ydb/docs/ru/core/cluster/index.md
@@ -2,6 +2,8 @@
В данном разделе находятся статьи для системных администраторов, отвечающих за работоспособность кластеров YDB, на которых разворачиваются прикладные базы данных.
+{% include [addition_overlay](_includes/addition_overlay.md) %}
+
{% note warning "Предупреждение" %}
Раздел находится в стадии разработки.