From 658a50cbcd8e174fc4700d6334682f4e48bb3292 Mon Sep 17 00:00:00 2001 From: Baohua Yang Date: Mon, 4 Sep 2017 19:31:17 +0800 Subject: [PATCH] Revert "fix #186" --- .travis.yml | 31 ------------------------------- .travis/deploy.sh | 30 ------------------------------ .travis/khs1994-robot.enc | Bin 1680 -> 0 bytes README.md | 2 -- kubernetes/concepts.md | 2 +- 5 files changed, 1 insertion(+), 64 deletions(-) delete mode 100644 .travis.yml delete mode 100755 .travis/deploy.sh delete mode 100644 .travis/khs1994-robot.enc 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 f46f6c7e354a4d41fd7987a2500e6da22a2669b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1680 zcmV;B25pb`-o`nIpy8*pq!+AC0$or1y^NXxk`*8Cwd{!saky;JBfjw* z`7WNScM14F!WX|BWNs?Of_p>hdH9ROy=jU_XwwEoOUT>I_GuL;ZfNw4Y9NpEejMt2Xe!mpE@$l!7?w zDbW$2?y^`S8rXamDq{$9`c&W@FZag9>~G<>Iq7cb=O^Qk*5U*`jxDwqU>=4ht#nte z=Kj4*r^fMN{1Q}LoPiTqmh9O1rk}9*y(sxd;pwEDwFs9)LsxntE&8f$*;F!MJ1=r` zDVh|2ZBA815&n9+3z(G)f|mYobC8-Q;N(rwa#V2un@{Fyv$g*$LIZtERPDBai`SQ* zEWOI;w}(Mtu;O4!9(X3|x_S;ACy>F8I?iUNA!KOx&`rL@2k%cOOFSx2kNyzVDDGO# zZ!E275ic_(*U;U7c31mCn`P6Vsg!2gX_;1Hzfy?uvRRH4yWM|R#_bt$AHL*}dd|NC zplqs+H$(oLn}e8sfk3%N(3{onjo4gFwqd9Zr)&o?Z#^_X3vQebjf z>({w9|uu=`X8v^#zZ^WFLg3a$o5wuXk1Kxv#_A-~Vo>sH`BPu)NIz7#0jd3I z^7y#aJ0r$cwu3^CHK^Hn-*_jZE`Rt|HMdNY_lWQleLsE0H+pkg4TQ`L?>EEVX>KiB zHx+f6=Y7V^F+35=eWXry$Z79f#%K_j5BzDbex9D-Lt}5^8&-?E8kX1pKw-KG$f3m| zl;(622w-Hug*HMogIR&ap00xAmA*qB5ppGiQ*MowdHE+=7Suk;y#u`g;p76~te4Gs z1;~bi=}?wN!|BEDiK;5|o~ad<857wBMQ02-(8T#3`PV`h{WZQs(aG3&*Fq zZBm?ea|gdrm>*hz)GbZ9KzgN&0jJfmBrt_lNt8ugD)%lklRMpRJLtC*vZ706@JrD4 zP7{+6deuZu#VVw3GfueSHki%2>8<M6#_n`~qwQ}676elJ&0&7d$izJNl3&VGJyLu!Y*g>?eeYsv$L(6ssc?}^amRL1~m ziF_$Rij7IL;JPgpm@QwRpN`*5)iM!W(}Y#eb&<|z+wOl$Qh*VDd6j@jR+NlI`UTy? zKuIiQ}eOI~-{RKep-S#XGmwx#SUj~pJ+6pt@y zUTVFJ2Hg@$hPcK-KCM%G35f`Ervh)4{g3HWz6UcncSOr$S(mz@YO2UUT{ zY6~E+Or#Rvj{m0s^0>a8304L{mH>3SWudxtae?lVQ>0Z#$N*H?a%z6Zf_LH*jXi|Km1l&CIolNzpI@?VSdp zZz$KbR62U!Q9f(_{l%I*;)K8caeh485XFq10!(D9g*N>~HkQaG1KQ*hvh_+&7Cz(hWOAInVilIi_PNWS4+v}^Dhj}DARXc^%kB<_^t8fLV&mvbf aQ?5rotupSu{sTAb=p&5}=93D=N0TCo*+fYI 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`。