From 25f48b847d042f5941d8898cd9145e1834608b7f Mon Sep 17 00:00:00 2001 From: OhCoder Date: Wed, 20 May 2015 21:02:09 +0800 Subject: [PATCH 1/8] modify the first paragraph. --- .README_ZH_cn_.md.swp | Bin 0 -> 45056 bytes README_ZH_cn_.md | 14 +++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 .README_ZH_cn_.md.swp diff --git a/.README_ZH_cn_.md.swp b/.README_ZH_cn_.md.swp new file mode 100644 index 0000000000000000000000000000000000000000..0984ff61f37d033374a999df0a8525e83bfb0508 GIT binary patch literal 45056 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 D4AH*J literal 0 HcmV?d00001 diff --git a/README_ZH_cn_.md b/README_ZH_cn_.md index 05ce824..eb22251 100644 --- a/README_ZH_cn_.md +++ b/README_ZH_cn_.md @@ -1,14 +1,14 @@ -# 小巧玲珑的ubuntu镜像 +# Docker 友好的,Ubuntu 下最小镜像 -Baseimage-docker是一个特殊的 [Docker](http://www.docker.io) 镜像,可以很优雅的将它用于docker镜像。相对于 Ubuntu, 有这些新增: +Baseimage-docker 是一个特殊的 [Docker](http://www.docker.io) 镜像,在 Docker 容器做了配置,并可以正确使用。相对于 Ubuntu, 如下新增项: - * 修改之后,可以很友好的使用docker - * 修复了一些docker的bug [some Docker bugs](#workaroud_modifying_etc_hosts). - * 很有用的管理员工具 + * 为了更友好的支持 Docker,做了修订。 + * 绕过了Docker的[一些bug](#workaroud_modifying_etc_hosts)。 + * 一个有用的管理员工具。 -你可以用它作为你自己的基础docker镜像。 +可以用它作为自己基础的 Docker 镜像。 -Baseimage-docker 可以从[the Docker registry](https://index.docker.io/u/phusion/baseimage/)获取到! +Baseimage-docker 项目可以直接从[Docker的registry](https://index.docker.io/u/phusion/baseimage/)获取! ### 原生的ubuntu基础镜像有什么问题呢? From b931dc5a47d4f7c97208371484835c61eeffd46b Mon Sep 17 00:00:00 2001 From: OhCoder Date: Wed, 20 May 2015 21:03:01 +0800 Subject: [PATCH 2/8] remove *swp file --- .README_ZH_cn_.md.swp | Bin 45056 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .README_ZH_cn_.md.swp diff --git a/.README_ZH_cn_.md.swp b/.README_ZH_cn_.md.swp deleted file mode 100644 index 0984ff61f37d033374a999df0a8525e83bfb0508..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 45056 zcmeI53w&JHUFWBiv}9>RDGTMX``KGNG?o~RoYYOgbrKxQjZNbRwv$rSpczYJYhpC-T_~RgI(KH&Eff|OTA*dW z|MNfh&ee=;Cuu({uu}4~G;_~A_niOvpa1#4&bjO7KeK#=^GIYth@W?bLZ5E`*wefJ zVsq$~d)^XS+mzfQU*GL#RsE7=UA!gIkgSb0+@bKNq{7OoWNm9>yeXZkOvM{EY)Q6k zs$5;)no1;_D%ZzS@kC>6W4xj+S-UCTQn_a7;;I!(YkqlIO>I+6q_OS}mCs(9rNAr& zZcl;M^oEL`eP`(X4?Q?v3eBDKUgt;N{q*h2&t93Oz$^u3DKJZcSqjWjV3q>26qu#J zECv3}Q6SxXZ|KwX>icZZ-g2AY-*3NPW`Do6sNBD^pWknP|3cCAd+g^A+uzR@U4NVX z?A8CdqU&$BpO@I*@3IZ`+WQ0c`zrf;ZPE36?e|aF--n8>d;NLFUjJ&*b^G<~uUQJr zQec(>vlN)6z$^u3DKJZcSqjWjV3q>26qu#Jze)NUnq0}90waf9DMtoq0m2q&w}3qAA3hAR1N5=-VO9Vd-)~)%}@5{Pwjz-{O{94zjXKA%uEdN$d=Y7A!wp5 zUK8J%NTr3ye%}K%W=7jGqZhIVuM}6*dmwxKlwTdBOVuaS+(^r{Xm0pauD^pv`PJ6M z>KYSGJgg;_CKbnfO784-C;@RPTbD@L5%*Y(`ts*qayzan>t$a#l|8oG?LGnJGLysE z{bQB!bZupQGL=rz-Kj&vQ>PD8k>vcuT9U1GHI2!-#D;CsKMK~Eg67GF$(7%-ZRfZp z-n4mhtfj^H}fEfXC%{y)~k|Hb$67+AbHUMo*B!$a?Lmv{4jINP-^KRiU$%2v=s zIo)S-x9>uJ=S`)FUZR%}>TzoIq#)Hc#A}*clC|-a-^J|N9r?*Cl-g1sOQ*a^mfRd~ z*_?=P(N=3uraJdb9Y5{vX?OcCW+vJ)V_i~t@V2s0sJuKkFpSJ8FXzv7GLTMkgClc_ z!AeK1wg_V`-`4DN=bhk)TL#6b*dfk>p8WE#~Qj|*T7m?azW2G%z z)6`Jrd{RnRB~rDmDan^}5R9#jh1)hVrw>gW8jxtJi*Jo6DIei=y1sRN;nt1jbFk@!d!|4A zBk}dAL^`gw@=%W~wgw(s%rxeihU%kk`_=rbyRzf`Lgm-H1Xq|f*d5;KcJ{ef_GQL9 z+@Yh{OQ$lUJ^7nA5mDJguT34g7O66Hfy<_jwdK!l*UK;(MT6YF5YEh9x}+DTcAn4O zd`0VU+m1wpYsY$+gChCNHKuXcuhShFL#AY@e{vrsg4ODbRlyb!p&e|nE){kmbBtyX z^&1|}4}V5#9k}LBUgX>SFB%Y zP{m*K%xup{_P{>vpxb@H?H-7PLh?LA4eoLG4(9d`MqAgnHlP-cDhoyC+ z<0@&~zOJe9iQLY!((f4`?(RGNI5~WC=Q{pPTF@zO=HsD7F{dfk7=LummildIG4VN% zEvk$?hGt)sZ0opJI;Qp?$&ZXo?Yt@6cNuzhe6?){tMdEJ%0qU59&9W(QfYj#tnFku@k1z3U!^JPN*DwkbW=aM|-`QEgFx#Jf7HFjS}uCd%oG_A;0&!+jo#bd~eaD z7~bj60pHfq#_I6tJb@A_t#xAW7sEr@Y9@p0LuXrjIHmVnKH89?K33hq7iHM)y~`EnBt}7S}RI zI~;se=EmWvfp%_XPBJkNC7JQPMbya+jJhLp?I4-9Ar7j5{L+QpZ!vX0ZG;f=qK8Gt zz0#)-4T=5#SJ=66>|wG0z4&(r_I^941H!QfHLsI;9cPT_zNBa-v{0ThVUJgKgl0U@n*geg}WT7r-PCzr!Fn z0s287Xak=H<)93_9lQ;E9iPLWfjYNo+K$TnK>z!D0 zbLw$tU2IdFCp7Rphia;eZ8L4ASYb1mQpJVK%!;)vwpp4E6)`~@dB#U#O=%~cbeeGw zBx)1QF*=cGa_Zun;|f&Ythy$~298T3n4KqyD&< zz417YUY~4DJFTqEp79y9epB_amUx*10joD88yb>ZD9I2wuh(Rbh-&1h)3u-pW1(B$ ztEUX(R&^R>V2nlOtX#Ze>7&mj;{^*8ZPruyvOBM4ySv@40sOTr(Ylbj{k`txLukeq z-S*cq69?^QbreRWzNosVRGmP{#Rysm=S_PsYvYZB`H_8Er@dTT=TvTvZERsoO>z6T zgBNbv=hkK#X_MYEXOE4GJ*N#(T?UU!X5tbCRp!eM#KobX0(2Bs~(GeQ}f+TJsDv?DX|qC5T~Jyr5%2m8gE*gNPBoD>U9 zwQ$?365n_j#X37MiH)0?uiG$pQ_<}1Tj=7^k_Jbigu~CBIwkdr4UB0b=8_3GC}%^1p!?f$Y^t>`=|l>X$NGIL z8e=K^TzHr8EH*S$q?5^pRK#*Io=j)!$2TwwrA&m6k&PdB-uFJ|W2Sio7aE+3iVd*@ zzn*d`R=p91tBkeO)+aW{D`%)YG=WtppHI+SIfBlAC<~l*PM6B+;LjBARV|5>b*2`DB$F8`?+l(LR z%F8%2l%v zs~0ONoadjP<1AWUg);^*kUex(+ShYNnrI?r!dz8h<~h#pAk*n&G_0q6nEw3cl=5h& zL=!3Hb|Gtel{MsJq3-GT5mazw*eY}jwm6LtUY)%XVA5s9RHsrk;k1;gFnWm z{|acqUjJ2VxBn2ozlpv6d*FA$Mz8^h?Jle=S%8?g!t&);N*%HY>oU5~vwb;=7y83Xm*J zHSE+LmZ1M^R=~_z0h+v{{^H!gwd~$AxLa*Z8&mR4rjKcUzPqku1JrYhvjoSa7`G;+)z1x(QmBi$i36IBqE%3?TJ9SkARXYY*#Nc3L2N^)zyo1}na=RE=_tLoFHOd6FueC#!)pyqJt zjHeYQKVS?$jH99du!Dg#U1wRhHhP|H$zX^uHC9oB22G!s_;K#s^g0JHX_!9Uc`0w}tz6?GNwt+{$ z!$4yDe~Vur4J4j_KX@m|;~y9W;xG7Va6kAqeu3WuzYFTYMsPp)U-$#Q2AV)4_^#Th-VWXdWWT_l;3tqh1783?1IocZd<0*`FR%z-z(VkI;QPT_!5>1e z*MQLNn$Yf_^~ZRdit>|X4g@ld3vMTy-CSFepzL{{qK(@~g-xWR8UPYjHc<)9m@ml8A8f;unmUmW%A@Ej<}ccTuYL!GH7Ha+4)^K^zMbZHg)_24m=xTqnA;eIXT{;lOs%=hpa}a z!i1HiIg`h82aZrz#1H4$jmYlN6qM3=67CK_yU*e8KMaq}Y+dZ#9f6QAh_e%2cZwU%^`;qgV8K8S%tCh5AZAzU65w!+5$qLyqDip{qo z3t6bMTO7ytc~yjpa{#E`?K;kW6L-%+E#wqUD2d1_ zVJQo(NvhYGsgbO(2K4nU?a6&tNfVeZT8c6(}S#bgo@tfPPR{- zn(zayy2*wIgv*Jt_99{=2Y=!qVO_7avj0Z6+7QQ*4H=ut%Ok8>?&v53W%uaF!bnbl z$-q!n%bx6XCl6(A_NtW7B~5u>29qC&b~VNuYh$(b@j8FXrerfqEwOIzN+rEBA`Y)!S8IqN@>ARZYjEg~}t&4AlB zIuAYez6W`XH`c{k3MxjG(d;f0HVdJ9kC-ipNA5F5>=%&G@Lgz1AaahGwKmG1>hlp<~)mE|Nr} z$0VggM4ws4RXw84L|P;H+DNKW&4LkDp%`Svg2GdXkJ{86qaKw>mWnomgeA9wv=EV~ z+RDNu>05!nd8G9D@)KMTE+xGKg*A77wr$iv)5x(k|mfwVUL`mL1r&cWcTjY zJ2PX0+$Os?nCa#=I&au``W`rLE3Ad2B9N0d!&W$N!iVmaxe{wmSFjh31gChc$qPNV z5PLSfomgKZT-cobCz`YY9m3hsc9hn|tJlGQa#4B6+HU(L z9}LQ=>1#*WYzc-EHW7lmmaM39s^?78Jmx%Wp5zJB5BtkMOGS(N{P{Il?{TwD z)@;8tQFckmp?z#!A*xS4gv7*C;o^!#r?T7QL~o{<6brM$$%=H$?3?nsqcsW7FkH67 zSJ|V}%`l42)_2Ax&e-ME6a4=6N7><{l_;Yb3ZfS|%T}#es`&zjq9&_O*HhXPRD{eO zA6m0&g=14h3)x8v7d^9d&D!OwRz4HeH~kJ*r6tw{L{qy%X8n><)tUkT05?Gg_(iY;NWQ)U{t+Ahx4;4LDXpGzeR%e&V1$Ok@fhx!7Rj4pM|%c9vLi-OtAt$Byp1AWnGdQ%xw@)>b7^A{7mjvcPG*gTURMb z?zW~4ky1oRyRbab0#*@!v%AkT<<1&e#vN+29v9grDLNUO4O%VK5+Qt`OX?J>K);U8I3RFs)L~GZ+guj5jZ&lX8I`i1&eV(Q z(!uxGQJI_4E9eEAs2XD*cn3C+8{|v`*}f`ym{?27PkJjFhffUcT9ET1c57&Mq>rt> zenGWDs`ZzuZTOB+TxQ&ZFA009lCYw)z-f-BuIqQFbg(%j`VMMkx(V<$l$5h9Uf6S+ zi-ycLi4Qw(2P=;%~oS)#cAY!YLEgW(3@)8?b8*GZRNVB<`*LnZ4rB6Mz zDx}|}$R@0f-$4|KrXfW?F=ySf9Oa4 zlzKk2YL!&8KGtF$Bi)nFrDT}%yy?qaO>Dfaq+(-8vgw0{TBdwyMX#%xN<-*CJ+#wt z%$NKUwTOR}T#h5Oa2%nr+t1LnAZ57Cddv(Vd*r!hI2qlb!@JaNt&b9e zn$hNo5CVs>uB__2A)G;>T-R&UzBJk3h*ZRTupyCr8zJQV;X;RuY3lO`4YS8H44%o4 zoTeMH&E=dlI9Lr!pE8^$sDl@kC~^A6Y_BbuU5Ua9-a zE!;ig5M{~lJuL+}CYYh7u7Hm~sZXagOmC$2e@WvI9*+@cfRrE+IGV^ta(;0-?BH6iP#-(QYip5VZ zWdwuq2a%&zHV2$PK_4lT90hUe!X6wfbV6F`f` zKUSI4UlMrQcN3RgkRAtj#DpZQ0V4i$7x8cH~&1m06jWhmx%F;ow`o4nSbQ0D#z@X;$M^* zN9H&G#yMrLbt`|gP-luwFb@7jhmEi;j)R>Tl1B$+3VZ6Tc4oiDWVA5HbObBE8;vE=R85}1G`wg zeg(;CI_}53DsSsD_3oV}yGxvV1!rTa{BB_5mJR+H?NMFd8WE8hZ=xQY9+^EpXbn~U zpflbKpw4Wgr_Fe`D5ds-msJtCZ-%QXN300c#;NL1ph&sd=RTc3=!l7diHcxCg9XRW ztJ}qeZvruP844)yW|1@NTPb;#tXi>R@yaS^@tP-}Ua@rLy0wOzO3pDV%09?#e>Hn; zLWJJIF_e7my!vgBv{Q#Jptgyh*`u#)xk7Qp^tRavk`2?%sc}#_Z?;a^OaoKl&&B0K;oYJ=PvfRy;uD(yVYow*h*#X zg3ddJvZlP;9qL5oU5G(UIoVG){0eNMMkPPg<&hBF)>8maMv0$f z_3RF;Em4^{x+r(9jW#OrGTUkZ-$0g-V2_I>i|pO=)G7l(A4px4H-H z`MO+zu?TG0Gj*}btF<4hohlJ2a=XqDGL{%r8^sYe!WQP3Vd}Nxh&)xXtY^+5`WBi% zu70Fkfnd{4qV=eRRc4G)8?|+NJ9FdbWTtB9Sd(D&Tfb&C*9(w5EN212! zMR*yXKlHG+G)Z>(kuz|kt;UNzw>ER|M_oK>7yQ8V?1A%`Z&t9V%te?oC0iTnoMzF= z9(?GL$b9~L(9=!CLY%AD8n;zQ2#~fla;CDJ*BKH%(-Ova;NR_(mNnb7h3jVSrJnhV z#bB&WGktrkBcT7R#t(Qx*qHm0pU z8wPg+4@Q>HBi9c%g>oYcDwMA>e#GfXcxFuu5<0-F0m%^qRq1aqIV#Gs}eO8Xxp2CjQ@nA^VEhxY++y)~Njow*O_Y2lRkf?<3D0ECupK-D9tVGe z?f*6KB#2=5zZ?7s_WoC}^_PMw@BsKJ@RI`Ud^ykmJJ|Ez29mS?XW$mN2}Zy$*aV&f zi@*oL=dkrZ3$B4WPz$O+9$MtUe*;&6(B@_EFXV^prn&wJEh4Y&D*yuPqmg7aa?M*E zMYh{B>2Vcux{f3^En2~`Mb7FqtClQXyH*?nk8!Or$!WFxZcV57H_=?nzfBabs6fBx z-#2%D%lG2h(jQ_^A?eGV4tSBNW7ZS?-~b%;+}9q^KK3zhlwfpRLZTi&d<5Ai^{iG&m+A%M| zGhX~Uq9yl;Td81TV|VR6WAfxpmaJJSISf}+)Ce=coNOJ|6p^S$C-?d*xrsh|dJ1cs z=+7M_<{rt7bh0vtx7@Qx=RGw4!3FNvwMVkYy2`@t&^dx_*#lRMHw)Dob64_{>^lQa zasW3Pf~VRu)NwtAM#ZRa)K8t>rAMU6*p6el4{*e;U7zfM@ZJuIYQ42W*aj^^Kbc8U zrkRlDxNNiOBQrkk2laG?f&gZoN&N3tAa&5vL0<vJn%WcojLTD86)&StQBE2 z4i&?Q+TFw1Z={uydKH;xT@$&9uH40u?A~*7^t5RUp{ph7mWGNYPPx?R=nd*LlxKPy zv%)qN%Tz#$lG}G(deygYs%^U;SI8Ro9k=OosE{-3JXX_fE}p1RiAGVS5Jho41(SMn z=jq6>3Ez>vyCWZzV=FcP9!DQTt{Wp$RxsZjWrEuZ*b2ivZX zrC`8QD=rh7H7#iYQrWl6L@68%+u3a%t9}T-R?c1zE=<$Rbebx)n|||mc4UA47It+Z zJ={)}nZyI-eI~a8(_bYm(QZc`l{J<~!nL}i%q+P~OPa1GjX$JzGz`D0=yg=W`7L+@ z6euV{>aVa2=}GI%=#cn{j3d^1KaH>2?cYU~mZjJZ$z0U6FJST+d7%91mliKz_YN_0 zWDB8e{GbCOc+G6UZ(&?S=hz`B@5S-OaZ%TOjtHx}(wak%&Nx9eeT=qIPB=^nYW;(j zQr``qnCTIqIEU7@Shdo|DwP9tdOalpDPg;lqv|LXUL@f8Dk+%u6;IO!bf(sNQsNDa ztIyf?UP+*oSA87&jS~z^}F@j9uUq0#~Y7D7B*vDZBdFn2MyzzRVVM z8){HrujW&R?HgH4im~R1SYm5<$^@%)Ib+Zf9X(nMo*ASf(tloZ#fqH1%z8&bY5gUzBd1s=w z1@*clf`vP)IjVC(HwCz(!*2IyG#gli20s#c{4jchxbHY4)dYn(H50dFAf~&vzSX>; zi5Sb4rfHE|XP$<4%Ywzp@FNV6j@LQ7SE%0nO%`BX+?lWO|A#PaKPC1p_Wx7X$o=Mh z*yvyrcn)~`0RE@g_+Ss{0dY_Vo&e$pxDUJ&oW}k?1)4x3SOn?_0h|RDAPl~Z?f;M9AHXf}5;zTB#P)vyczFPG`1`%!TlfOL3BCrV zfSmg$dH>IW1h^Oc0Qe?80Lcev1!*Af0el2J4Bi92f-m5Yz**1*I>DEq(-*;6a0YxD z2<@H+Z{kOW-1iHbd>->!z3DI1yZdpJ*(;;GtdB{++Q91W3qO5{pC4!{?D#UicNLJ_ zBASl8-$L^4sRZ|8TfXZO--;Hr_k6zB96CGJ#mN&ahLW8vuP>4f<<}(mNTlRkk5x*x zAFbo1V%Zz}*>xMHl=`{-nLl;$F!TDbePDl=Xl$MXi@i62W@*#4O9dhOx?VaM6t*mi zk`ju2?!TY#dweAAovRMX2p2mmT%m z$ym~I?6OY-^Bi^{nO#G004z3pLarA8R~-S?TV6HY%QM}5QX=1V>Q;Dkt}t}fWyue* zs>hcrQ8@xYa!{s~k51Fg&Ge!js-$yMW};pG*Z1zJs%3O)(a~@%n3M$Gt#pKqt=cz_uELAt-DYw`L`+)yaV#5R}9gj zA|m>2W}8n6TOZApFqV0QiX5Lt(p>9@3G~9gK9qJ8FIyt;yGQtymmh?2x38-$#;Td`CwlsVP&R=2KO_fdJPMPn>o z_Pwk;(%ig>2%ZVAYf7$iigsLFf3i(h@*Z@*yp9Z5Sm-fAB<$lNv&UF_PsP{e zdkplNt%=bNwngofh}+4IyLWvI zkH3L;eMpRo?XreElF+YS0_ml^3R+(KVRNHkJ&i>KiAz7Nzl}G41jU@Z_=7W%SaXfI z_GF;XbZY{#V%K7eFIu08fIqfFH#M|M%dJu(kgX{2Dk32EkS!XY$ry$VG4V_QW#z1Ufg07yHtqC<=8M zmD{TUsR)mWCSqbzoL8Zyr7ldKkIgV6B-EKBdXQo88DHL1+!T8b9y>n#<2pDk=VKW!F;+vx@k$2t| zUO#`k5rKUlmFOQ|+* z9H+2aQqlWm&w4Zxop#7rRJqSK(@))Do#)8+Pde3xg>{nizQj~xtfemA6iK#hlrzr~ zX*n6*(HF#N`Y(@rnl|uO#0bY5$xC%}1N-oCsQn@lKXZ;rgwC$rmU;#cTq0f4W3xX* zU6rI3V$SQ`**!Z*7q)r2qy*#ekY!|iz(#th(>|LT{XOGy#)CYeTeM1_4YYf;Er|F} z@~Wc3<_$Z$>?v7=@8xDQXY@{@j_ez2fj#8@_U-xMQ8TgRwcWu)311BjYPDt;fb2%G z3EqC#4LhJLvS@wFV**K}nK?yAd5I>_D2=k>o;nPjG(keYva?Y2>}sn~`A@Q+%Ocd` zr~YWY_I5Q+Z8=-LCmZYrof@yH`Ve=dBX@E;W6Wk~R#}c|s^EQO&CHXyHk92#_K+Cn zrDmOTfl%uO+OBnAwDT%IHqiQa$YO5jD@DBrYK90j#jy3$*Zp&3=z%;+FIatmrkh!% z50qh2H-Nt&kP;+sEi`P8+-gZmf*FHb_?ul-a_nMZbA{~g(UsS3M6lYW33CZk9UIKw zyd=Q^j?UTJle_U5-4Ub@QTbRw7zz&3GY?s^B+e=tkxm<7C33pVZcq#pQL=eY`XOmExhDSUfmTW@L3QQO?M+(LK1EaXwKe`W zDD|C)S5!O&r#S{w>;r#@`lJtT|0P)?IK0;ML3>UjushVN$KB~lAQ`_Y=urJsJl4`= zUJe_9SH1l6x|+a&Dd}2skXlM!O7Y3U>&ZFx4R5>ml1ijv`wd1MqA9ad`P%r5FVVbB zKJkO|A6j6WYX*ef4@RJtms6*|y-exjPl5)B*}+S&wjdY zkKH6xkv>H-7(B`%PjtDYsm2%TZa+pLB`i%+Ce;?y}IN{z|v~ z>eQjj(jn7Dn|`T}vGdfBOo?UJ4sUW4YmR=Jx=wzrMcZN5YrFY~T^IOCyp>&bT3rM& z1UMpGIo7_4{=o&2`3sz<*vE;4863}@YSV^kp^Bm(3Ke}LAI&5aUOs+EG<5l)GJ7nc zXqZl=qls~p43&#KKE|7qM1+Z1eL!A?7d&b2aa!x;lbAxLD)V+{eYx`t?{=mNn~y`? z{Qq5^4<0F33od(h2fI!S3jP*eI-T+|Op+|^n-lRZo@R-epoWAdDhDYLP)>tY*gO9( D4AH*J From 1ab802c396129cef04869e8926dde7462a961b83 Mon Sep 17 00:00:00 2001 From: OhCoder Date: Wed, 20 May 2015 21:04:37 +0800 Subject: [PATCH 3/8] add the *swp file in the .gitignore file --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 1261834..a10d215 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .DS_Store .vagrant +*.swp From cf48520dbaf84665d7b9e44dab8f71768cf69302 Mon Sep 17 00:00:00 2001 From: OhCoder Date: Wed, 20 May 2015 21:09:44 +0800 Subject: [PATCH 4/8] remove the blank space between English words and Chinses words from the first paragraph --- README_ZH_cn_.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README_ZH_cn_.md b/README_ZH_cn_.md index eb22251..6a984da 100644 --- a/README_ZH_cn_.md +++ b/README_ZH_cn_.md @@ -1,14 +1,14 @@ -# Docker 友好的,Ubuntu 下最小镜像 +# Docker友好的,Ubuntu下最小镜像 -Baseimage-docker 是一个特殊的 [Docker](http://www.docker.io) 镜像,在 Docker 容器做了配置,并可以正确使用。相对于 Ubuntu, 如下新增项: +Baseimage-docker是一个特殊的[Docker](http://www.docker.io)镜像,在Docker容器做了配置,并可以正确使用。相对于Ubuntu, 如下新增项: - * 为了更友好的支持 Docker,做了修订。 + * 为了更友好的支持Docker,做了修订。 * 绕过了Docker的[一些bug](#workaroud_modifying_etc_hosts)。 * 一个有用的管理员工具。 -可以用它作为自己基础的 Docker 镜像。 +可以用它作为自己基础的Docker镜像。 -Baseimage-docker 项目可以直接从[Docker的registry](https://index.docker.io/u/phusion/baseimage/)获取! +Baseimage-docker项目可以直接从Docker的[registry](https://index.docker.io/u/phusion/baseimage/)获取! ### 原生的ubuntu基础镜像有什么问题呢? From a898aa51b9e14898e7957b6a38278fea79df056f Mon Sep 17 00:00:00 2001 From: OhCoder Date: Wed, 20 May 2015 21:13:14 +0800 Subject: [PATCH 5/8] modify the first paragraph --- README_ZH_cn_.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README_ZH_cn_.md b/README_ZH_cn_.md index 6a984da..4005ebc 100644 --- a/README_ZH_cn_.md +++ b/README_ZH_cn_.md @@ -1,8 +1,8 @@ # Docker友好的,Ubuntu下最小镜像 -Baseimage-docker是一个特殊的[Docker](http://www.docker.io)镜像,在Docker容器做了配置,并可以正确使用。相对于Ubuntu, 如下新增项: +Baseimage-docker是一个特殊的[Docker](http://www.docker.io)镜像,在Docker容器内做了配置,并可以正确使用。相较于Ubuntu下的Docker, 如下新增项: - * 为了更友好的支持Docker,做了修订。 + * 为更加友好的支持Docker,做了修订。 * 绕过了Docker的[一些bug](#workaroud_modifying_etc_hosts)。 * 一个有用的管理员工具。 From e1848ec8177041f3a528e5732c80efd47f2d7373 Mon Sep 17 00:00:00 2001 From: OhCoder Date: Wed, 20 May 2015 21:15:24 +0800 Subject: [PATCH 6/8] modify the exclamation mark --- README_ZH_cn_.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_ZH_cn_.md b/README_ZH_cn_.md index 4005ebc..23927b4 100644 --- a/README_ZH_cn_.md +++ b/README_ZH_cn_.md @@ -8,7 +8,7 @@ Baseimage-docker是一个特殊的[Docker](http://www.docker.io)镜像,在Dock 可以用它作为自己基础的Docker镜像。 -Baseimage-docker项目可以直接从Docker的[registry](https://index.docker.io/u/phusion/baseimage/)获取! +Baseimage-docker项目可以直接从Docker的[registry](https://index.docker.io/u/phusion/baseimage/)获取! ### 原生的ubuntu基础镜像有什么问题呢? From 2a9cccff16bf8aaa63be4b347451bbbc872e46d0 Mon Sep 17 00:00:00 2001 From: OhCoder Date: Wed, 20 May 2015 22:19:05 +0800 Subject: [PATCH 7/8] update the paragraphs above the menu. --- README_ZH_cn_.md | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/README_ZH_cn_.md b/README_ZH_cn_.md index 23927b4..f112450 100644 --- a/README_ZH_cn_.md +++ b/README_ZH_cn_.md @@ -1,43 +1,44 @@ -# Docker友好的,Ubuntu下最小镜像 + +# Docker友好的,最小的Ubuntu基础镜像 -Baseimage-docker是一个特殊的[Docker](http://www.docker.io)镜像,在Docker容器内做了配置,并可以正确使用。相较于Ubuntu下的Docker, 如下新增项: +Baseimage-docker是一个特殊的[Docker](http://www.docker.io)镜像,在Docker容器内做了配置,并且可以正确使用。它确实是一个Ubuntu系统, 除此之外进行了如下修订: * 为更加友好的支持Docker,做了修订。 - * 绕过了Docker的[一些bug](#workaroud_modifying_etc_hosts)。 - * 一个有用的管理员工具。 + * 在Docker环境下,作为管理工具特别有用。 + * 在[不违反Docker哲学](#docker_single_process)的前提下,能够很容易的运行多进程的机制。 -可以用它作为自己基础的Docker镜像。 +可以把它作为自己的基础Docker镜像。 Baseimage-docker项目可以直接从Docker的[registry](https://index.docker.io/u/phusion/baseimage/)获取! + + +### 原生的Ubuntu基础镜像有什么问题呢? -### 原生的ubuntu基础镜像有什么问题呢? +原生Ubuntu不是为了在Docker内运行而设计的。它的初始化系统Upstart,假定运行的环境要么是真实的硬件,要么是虚拟的硬件,而不是在Docker容器内。但是在一个Docker的容器内,并不需要一个完整的系统,你需要的只是一个很小的系统。但是如果你不是非常熟悉Unix的系统模型,想要在Docker容器内裁减出最小的系统,会碰到很多难以正确解决的陌生的技术坑。这些坑会引起很多莫名其妙的问题。 -原生ubuntu不是设计为运行docker的。它是假设运行到真实硬件或者虚拟硬件上的,但不是docker容器。你运行docker容器,不需要一个完整的系统,你需要一个小巧的系统。如果你不熟悉unix系统,那么配制出来的精简系统会有很奇怪的问题。这样就可以导致很多奇奇怪怪的问题。 +Baseimage-docker让这一切完美。在"内容"部分描述了所有这些修改。 -Baseimage-docker 将错误都修正了。在"内容"部分,可以看到哪些内容修改过了. + +### 为什么使用baseimage-docker? - -### 为什么使用 baseimage-docker? - -你可以用原生`ubuntu`镜像作为你的Dockerfile,那为什么又麻烦的使用baseimage-docker呢? - - * 配置一个友好的基础镜像不是一个简单的任务.正如之前提到的,会很有的坑在里面.当你处理那些坑之后,你又重复造了一个baseimage-docker.使用baseimage-docker会拯救你的努力. - * 它减少了一个写正确Dockerfile文件的时间.你不用担心基础系统,你可以专注你的业务和你的项目. - * 它减少了运行`docker build`的时间,让你更快的迭代Dockerfile. - * 它减少了多次下载的时间.Docker只需要下载一次基础镜像:在第一次部署的时候.在之后的部署中,只需要对你最近的基础镜像进行修改. +你自己可以从Dockerfile配置一个原生`ubuntu`镜像,为什么还要多此一举的使用baseimage-docker呢? + + * 配置一个Docker友好的基础系统并不是一个简单的任务。如前所述,过程中会碰到很多坑。当你搞定这些坑之后,只不过是又重新发明了一个baseimage-docker而已。使用baseimage-docker可以免去你这方面需要做的努力。 + * 减少需要正确编写Dockerfile文件的时间。你不用再担心基础系统,可以专注于你自己的技术栈和你的项目。 + * 减少需要运行`docker build`的时间,让你更快的迭代Dockerfile。 + * 减少了重新部署的时的下载时间。Docker只需要下载一次基础镜像:在第一次部署的时候。在之后的部署中,只需要下载你最近对基础镜像进行修改的部分。 ----------------------------------------- **相关资源** - [Website](http://phusion.github.io/baseimage-docker/) | + [网站](http://phusion.github.io/baseimage-docker/) | [Github](https://github.com/phusion/baseimage-docker) | [Docker registry](https://index.docker.io/u/phusion/baseimage/) | - [Discussion forum](https://groups.google.com/d/forum/passenger-docker) | + [论坛](https://groups.google.com/d/forum/passenger-docker) | [Twitter](https://twitter.com/phusion_nl) | [Blog](http://blog.phusion.nl/) -**Table of contents** **目录** * [镜像里面包含什么?](#whats_inside) From ffe8b447cab4b17b8fde08fb65cc037f5034bacd Mon Sep 17 00:00:00 2001 From: OhCoder Date: Wed, 20 May 2015 22:46:20 +0800 Subject: [PATCH 8/8] update Docker link --- README_ZH_cn_.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_ZH_cn_.md b/README_ZH_cn_.md index b305ad0..084abe6 100644 --- a/README_ZH_cn_.md +++ b/README_ZH_cn_.md @@ -14,7 +14,7 @@ Baseimage-docker项目可以直接从Docker的[registry](https://index.docker.io ### 原生的Ubuntu基础镜像有什么问题呢? -Baseimage-docker可以直接从[Docker registry](https://registry.hub.docker.com/u/phusion/baseimage/)获取! +Baseimage-docker可以直接从Docker的[registry](https://registry.hub.docker.com/u/phusion/baseimage/)获取! 原生Ubuntu不是为了在Docker内运行而设计的。它的初始化系统Upstart,假定运行的环境要么是真实的硬件,要么是虚拟的硬件,而不是在Docker容器内。但是在一个Docker的容器内,并不需要一个完整的系统,你需要的只是一个很小的系统。但是如果你不是非常熟悉Unix的系统模型,想要在Docker容器内裁减出最小的系统,会碰到很多难以正确解决的陌生的技术坑。这些坑会引起很多莫名其妙的问题。