diff --git a/docs/guide/harbor.md b/docs/guide/harbor.md index 131b7bc..cf9aa16 100644 --- a/docs/guide/harbor.md +++ b/docs/guide/harbor.md @@ -157,7 +157,7 @@ cd .. mkdir -p /backup && mv harbor /backup/harbor # 下载更新的离线安装包,并解压 -tar zxvf harbor-offline-installer-v1.2.2.tgz -C /data +tar xvf harbor-offline-installer-v1.2.2.tgz -C /data # 使用官方数据库迁移工具,备份数据库,修改数据库连接用户和密码,创建数据库备份目录 # 迁移工具使用docker镜像,镜像tag由待升级到目标harbor版本决定,这里由 1.1.2升级到1.2.2,所以使用 tag 1.2 diff --git a/docs/setup/00-planning_and_overall_intro.md b/docs/setup/00-planning_and_overall_intro.md index 8ee6c1c..97f1a80 100644 --- a/docs/setup/00-planning_and_overall_intro.md +++ b/docs/setup/00-planning_and_overall_intro.md @@ -90,14 +90,14 @@ git clone --depth=1 https://github.com/gjmzj/kubeasz.git /etc/ansible 请从分享的[百度云链接](https://pan.baidu.com/s/1c4RFaA),下载解压到/etc/ansible/bin目录,如果你有合适网络环境也可以按照/down/download.sh自行从官网下载各种tar包 ``` bash -tar zxvf k8s.1-9-8.tar.gz # 以安装k8s v1.9.8为例 +tar xvf k8s.1-9-8.tar.gz # 以安装k8s v1.9.8为例 mv bin/* /etc/ansible/bin ``` - 4.2b [可选]下载离线docker镜像 服务器使用内部yum源/apt源,但是无法访问公网情况下,请下载离线docker镜像完成集群安装;从百度云盘把`basic_images_kubeasz_x.y.tar.gz` 下载解压到`/etc/ansible/down` 目录 ``` bash -tar zxvf basic_images_kubeasz_1.0.tar.gz -C /etc/ansible/down +tar xvf basic_images_kubeasz_1.0.tar.gz -C /etc/ansible/down ``` - 4.3 配置集群参数 - 4.3.1 必要配置:`cd /etc/ansible && cp example/hosts.m-masters.example hosts`, 然后实际情况修改此hosts文件 diff --git a/docs/setup/quickStart.md b/docs/setup/quickStart.md index fd957c4..39bc41b 100644 --- a/docs/setup/quickStart.md +++ b/docs/setup/quickStart.md @@ -77,14 +77,14 @@ git clone --depth=1 https://github.com/gjmzj/kubeasz.git /etc/ansible 请从分享的[百度云链接](https://pan.baidu.com/s/1c4RFaA),下载解压到/etc/ansible/bin目录,如果你有合适网络环境也可以按照/down/download.sh自行从官网下载各种tar包 ``` bash -tar zxvf k8s.1-9-8.tar.gz # 以安装k8s v1.9.8为例 +tar xvf k8s.1-9-8.tar.gz # 以安装k8s v1.9.8为例 mv bin/* /etc/ansible/bin ``` - 4.2b [可选]下载离线docker镜像 服务器使用内部yum源/apt源,但是无法访问公网情况下,请下载离线docker镜像完成集群安装;从百度云盘把`basic_images_kubeasz_x.y.tar.gz` 下载解压到`/etc/ansible/down` 目录 ``` bash -tar zxvf basic_images_kubeasz_1.0.tar.gz -C /etc/ansible/down +tar xvf basic_images_kubeasz_1.0.tar.gz -C /etc/ansible/down ``` - 4.3 配置集群参数 - 4.3.1 必要配置:`cd /etc/ansible && cp example/hosts.allinone.example hosts`, 然后实际情况修改此hosts文件 diff --git a/tools/basic-env-setup.sh b/tools/basic-env-setup.sh index 2d96575..98e91ec 100644 --- a/tools/basic-env-setup.sh +++ b/tools/basic-env-setup.sh @@ -73,7 +73,7 @@ setup_ansible_k8s() { # Download from CDN & Move bin files curl -o k8s_download.tar.gz "$bin_resource_url" - tar zxvf k8s_download.tar.gz + tar xvf k8s_download.tar.gz mv -f bin/* /etc/ansible/bin rm -rf bin echo "Finish setup. Please config your hosts and run 'ansible-playbook' command at /etc/ansible."