diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 970f0f7..0000000 --- a/.travis.yml +++ /dev/null @@ -1,31 +0,0 @@ -language: node_js -node_js: stable -cache: - directories: - - "node_modules" -before_install: -- openssl aes-256-cbc -K $encrypted_4514352cb17e_key -iv $encrypted_4514352cb17e_iv - -in .travis/khs1994-robot.enc -out ~/.ssh/id_rsa -d -- chmod 600 ~/.ssh/id_rsa -- git config --global user.name "khs1994-merge-robot" -- git config --global user.email "ai@khs1994.com" -- echo "TZ='Asia/Shanghai'; export TZ" >> ~/.profile -- . ~/.profile -install: -- git ls-files | while read file; do touch -d $(git log -1 --format="@%ct" "$file") "$file"; done -#- npm install gitbook -g -#- npm install gitbook-cli -script: -#- node_modules/gitbook-cli/bin/gitbook.js install -- node_modules/gitbook-cli/bin/gitbook.js build -after_success: - - sh .travis/deploy.sh -branches: - only: - - master -env: - global: - - REPO: git@github.com:khs1994-gitbook/docker_practice.git -addons: - ssh_known_hosts: - - github.com diff --git a/.travis/deploy.sh b/.travis/deploy.sh deleted file mode 100755 index 26c5b1a..0000000 --- a/.travis/deploy.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -pwd -git clone -b gh-pages "$REPO" .deploy_git -if [ ! $? = 0 ];then - #不存在 - echo -e "\033[31mINFO\033[0m BRANCH NOT exist" - mkdir .deploy_git - cd .deploy_git - git init - git remote add origin $REPO - git checkout -b gh-pages - cd .. -else - #存在 - git ls-files | while read file; do touch -d $(git log -1 --format="@%ct" "$file") "$file"; done - echo -e "\033[32mINFO\033[0m BRANCH exist" - rm -rf .deploy_git/* -fi -# Deploy to GitHub and aliyun -cp -r _book/* .deploy_git/ -cd .deploy_git -git add . -COMMIT=`date "+%F %T"` -TAG=`date '+%s'` -git commit -m "Travis CI Site updated: $COMMIT" -git push -f origin gh-pages -git tag | tail -10 -git tag -git tag $TAG -git push origin $TAG diff --git a/.travis/khs1994-robot.enc b/.travis/khs1994-robot.enc deleted file mode 100644 index f46f6c7..0000000 Binary files a/.travis/khs1994-robot.enc and /dev/null differ diff --git a/README.md b/README.md index e458c85..a89308e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # Docker — 从入门到实践 -[![Build Status](https://travis-ci.org/khs1994-gitbook/docker_practice.svg?branch=master)](https://travis-ci.org/khs1994-gitbook/docker_practice) - 0.8.3 [Docker](http://www.docker.com) 是个划时代的开源项目,它彻底释放了计算虚拟化的威力,极大提高了应用的运行效率,降低了云计算资源供应的成本! 使用 Docker,可以让应用的部署、测试和分发都变得前所未有的高效和轻松! diff --git a/kubernetes/concepts.md b/kubernetes/concepts.md index ad00937..4f1b5e4 100644 --- a/kubernetes/concepts.md +++ b/kubernetes/concepts.md @@ -126,7 +126,7 @@ Kubernetes校验节点可用依赖于id。在当前的版本中,有两个接 ### 容器组生命周期 -通常来说,如果容器组被创建了就不会自动销毁,除非被某种行为触发,而触发此种情况可能是人为,或者复制控制器所为。唯一例外的是容器组由 succeeded状态成功退出,或者在一定时间内重试多次依然失败。 +通常来说,如果容器组被创建了就不会自动销毁,除非被某种行为出发,而触发此种情况可能是人为,或者复制控制器所为。唯一例外的是容器组由 succeeded状态成功退出,或者在一定时间内重试多次依然失败。 如果某个节点死掉或者不能连接,那么节点控制器将会标记其上的容器组的状态为 `failed`。