Skip to content
This repository has been archived by the owner on Sep 20, 2023. It is now read-only.

Commit

Permalink
fix: 补充 git rebase 详细使用方法
Browse files Browse the repository at this point in the history
  • Loading branch information
@ekoz
ekoz committed Dec 10, 2020
1 parent 8a1401e commit 033be9f
Show file tree
Hide file tree
Showing 17 changed files with 161 additions and 46 deletions.
Binary file modified docs/_build/doctrees/docker.doctree
View file
Binary file not shown.
Binary file modified docs/_build/doctrees/environment.pickle
View file
Binary file not shown.
Binary file modified docs/_build/doctrees/git.doctree
View file
Binary file not shown.
Binary file added docs/_build/html/_images/rebase-1.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_build/html/_images/rebase-2.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_build/html/_images/rebase-3.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 38 additions & 0 deletions docs/_build/html/_sources/docker.md.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,44 @@ docker inspect container_id

[https://blog.csdn.net/liukuan73/article/details/78089138](https://blog.csdn.net/liukuan73/article/details/78089138)

```
docker save \
ekozhan/nginx:1.0 \
ekozhan/elasticsearch:1.0 \
ekozhan/kibana:1.0 \
| gzip > docker_images_20201202_1.0.tar.gz
```

### 将容器打包成镜像并启动

```
[root@localhost mysql]# docker ps
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
cc72f2b081b9 mysql:8.0 "docker-entrypoint.s…" 3 weeks ago Up 6 minutes 0.0.0.0:3306->3306/tcp, 33060/tcp mysql-docker
[root@localhost mysql]# pwd
/opt/app/mysql
[root@localhost mysql]# ls
data docker-compose.yml
[root@localhost mysql]# docker export -o mysql-export.tar cc72f2b081b9
[root@localhost mysql]# ls
data docker-compose.yml mysql-export.tar
[root@localhost mysql]# docker import mysql-export.tar ekozhan/mysql:0.1
sha256:cde3f783415f0dc7a76d7df89765ced2e59db38dff3e2534d859b476f5497e15
[root@localhost mysql]# docker images
REPOSITORY TAG IMAGE ID CREATED SIZE
ekozhan/mysql 0.1 cde3f783415f 5 seconds ago 538MB
mysql 8.0 8e85dd5c3255 3 weeks ago 544MB
wurstmeister/kafka latest 40094a582680 2 months ago 435MB
wurstmeister/zookeeper latest 3f43f72cb283 21 months ago 510MB
[root@localhost mysql]# docker run --name mysql3306 -e MYSQL_ROOT_PASSWORD=123456 -d -p 3308:3308 cde3f783415f docker-entrypoint.sh mysqld
dd344b94113c301930b5b0a5184ed41b4679e7a5b4e45adb69f894df1a870417
[root@localhost mysql]# docker ps
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
dd344b94113c cde3f783415f "docker-entrypoint.s…" 4 seconds ago Up 3 seconds 0.0.0.0:3308->3308/tcp mysql3306
cc72f2b081b9 mysql:8.0 "docker-entrypoint.s…" 3 weeks ago Up 15 minutes 0.0.0.0:3306->3306/tcp, 33060/tcp mysql-docker

```

## Docker: 限制容器可用的内存

[https://www.cnblogs.com/sparkdev/p/8032330.html](https://www.cnblogs.com/sparkdev/p/8032330.html)
Expand Down
30 changes: 21 additions & 9 deletions docs/_build/html/_sources/git.md.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,23 +94,35 @@ sourcetree 中的配置方法

> git rebase -i HEAD~N

1. i 键入
N 是指要压缩的最近的 commit

pick XXX xxx
- 筛选需要合并的 commit

需要改成 s XXX xxx
命令输入后会切换到编辑框，vi 命令操作

不需要改成 d XXX xxx
第一行还是 pick 开头

wq
后面需要的 commit message 前缀改成 s，不需要的前缀改成 d，如下图所示

2. i 键入
![rebase-1](./assets/rebase-1.png)

修改 Commit
修改完毕后 wq 保存

wq
- 修改 commit message

3. 推送
此时会切换至 commit message 合并页面，依然是 vi 命令，将不需要的 commit message 用 # 注释即可，wq 保存

![rebase-2](./assets/rebase-2.png)

- 强制推送

`git push –f`

由于服务器上已经存在该分支，所以需要强制推送，注意，无法强制推送至受保护的分支

![rebase-3](./assets/rebase-3.png)

_注意：在开发过程中，建议 checkout 新分支进行开发，开发完毕后，merge rquest 给分支负责人进行合并，merge request 的时候勾选 squash 即可由 gitlab 帮我们进行分支合并_

## git commit 规范

Expand Down
57 changes: 48 additions & 9 deletions docs/_build/html/docker.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,14 @@
<li class="toctree-l2"><a class="reference internal" href="#id1">Docker 镜像与容器</a></li>
<li class="toctree-l2"><a class="reference internal" href="#id2">docker 同时删除停止的容器</a></li>
<li class="toctree-l2"><a class="reference internal" href="#dockerfile">Dockerfile 编写样例</a></li>
<li class="toctree-l2"><a class="reference internal" href="#docker-save-docker-export">Docker save 与 Docker export 的区别</a></li>
<li class="toctree-l2"><a class="reference internal" href="#id3">Docker: 限制容器可用的内存</a></li>
<li class="toctree-l2"><a class="reference internal" href="#docker-save-docker-export">Docker save 与 Docker export 的区别</a><ul>
<li class="toctree-l3"><a class="reference internal" href="#id3">将容器打包成镜像并启动</a></li>
</ul>
</li>
<li class="toctree-l2"><a class="reference internal" href="#id4">Docker: 限制容器可用的内存</a></li>
<li class="toctree-l2"><a class="reference internal" href="#demo">Demo</a></li>
<li class="toctree-l2"><a class="reference internal" href="#id4">docker-compose</a></li>
<li class="toctree-l2"><a class="reference internal" href="#id5">相关资料</a></li>
<li class="toctree-l2"><a class="reference internal" href="#id5">docker-compose</a></li>
<li class="toctree-l2"><a class="reference internal" href="#id6">相关资料</a></li>
<li class="toctree-l2"><a class="reference internal" href="#centos8-docker">CentOS8 安装 docker 遇到的报错</a></li>
</ul>
</li>
Expand Down Expand Up @@ -271,9 +274,45 @@ <h2>Dockerfile 编写样例<a class="headerlink" href="#dockerfile" title="Perma
<div class="section" id="docker-save-docker-export">
<h2>Docker save 与 Docker export 的区别<a class="headerlink" href="#docker-save-docker-export" title="Permalink to this headline"></a></h2>
<p><a class="reference external" href="https://blog.csdn.net/liukuan73/article/details/78089138">https://blog.csdn.net/liukuan73/article/details/78089138</a></p>
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">docker</span> <span class="n">save</span> \
<span class="n">ekozhan</span><span class="o">/</span><span class="n">nginx</span><span class="p">:</span><span class="mf">1.0</span> \
<span class="n">ekozhan</span><span class="o">/</span><span class="n">elasticsearch</span><span class="p">:</span><span class="mf">1.0</span> \
<span class="n">ekozhan</span><span class="o">/</span><span class="n">kibana</span><span class="p">:</span><span class="mf">1.0</span> \
<span class="o">|</span> <span class="n">gzip</span> <span class="o">&gt;</span> <span class="n">docker_images_20201202_1</span><span class="o">.</span><span class="mf">0.</span><span class="n">tar</span><span class="o">.</span><span class="n">gz</span>
</pre></div>
</div>
<div class="section" id="id3">
<h2>Docker: 限制容器可用的内存<a class="headerlink" href="#id3" title="Permalink to this headline"></a></h2>
<h3>将容器打包成镜像并启动<a class="headerlink" href="#id3" title="Permalink to this headline"></a></h3>
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="p">[</span><span class="n">root</span><span class="nd">@localhost</span> <span class="n">mysql</span><span class="p">]</span><span class="c1"># docker ps</span>
<span class="n">CONTAINER</span> <span class="n">ID</span> <span class="n">IMAGE</span> <span class="n">COMMAND</span> <span class="n">CREATED</span> <span class="n">STATUS</span> <span class="n">PORTS</span> <span class="n">NAMES</span>
<span class="n">cc72f2b081b9</span> <span class="n">mysql</span><span class="p">:</span><span class="mf">8.0</span> <span class="s2">&quot;docker-entrypoint.s…&quot;</span> <span class="mi">3</span> <span class="n">weeks</span> <span class="n">ago</span> <span class="n">Up</span> <span class="mi">6</span> <span class="n">minutes</span> <span class="mf">0.0</span><span class="o">.</span><span class="mf">0.0</span><span class="p">:</span><span class="mi">3306</span><span class="o">-&gt;</span><span class="mi">3306</span><span class="o">/</span><span class="n">tcp</span><span class="p">,</span> <span class="mi">33060</span><span class="o">/</span><span class="n">tcp</span> <span class="n">mysql</span><span class="o">-</span><span class="n">docker</span>
<span class="p">[</span><span class="n">root</span><span class="nd">@localhost</span> <span class="n">mysql</span><span class="p">]</span><span class="c1"># pwd</span>
<span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="n">mysql</span>
<span class="p">[</span><span class="n">root</span><span class="nd">@localhost</span> <span class="n">mysql</span><span class="p">]</span><span class="c1"># ls</span>
<span class="n">data</span> <span class="n">docker</span><span class="o">-</span><span class="n">compose</span><span class="o">.</span><span class="n">yml</span>
<span class="p">[</span><span class="n">root</span><span class="nd">@localhost</span> <span class="n">mysql</span><span class="p">]</span><span class="c1"># docker export -o mysql-export.tar cc72f2b081b9</span>
<span class="p">[</span><span class="n">root</span><span class="nd">@localhost</span> <span class="n">mysql</span><span class="p">]</span><span class="c1"># ls</span>
<span class="n">data</span> <span class="n">docker</span><span class="o">-</span><span class="n">compose</span><span class="o">.</span><span class="n">yml</span> <span class="n">mysql</span><span class="o">-</span><span class="n">export</span><span class="o">.</span><span class="n">tar</span>
<span class="p">[</span><span class="n">root</span><span class="nd">@localhost</span> <span class="n">mysql</span><span class="p">]</span><span class="c1"># docker import mysql-export.tar ekozhan/mysql:0.1</span>
<span class="n">sha256</span><span class="p">:</span><span class="n">cde3f783415f0dc7a76d7df89765ced2e59db38dff3e2534d859b476f5497e15</span>
<span class="p">[</span><span class="n">root</span><span class="nd">@localhost</span> <span class="n">mysql</span><span class="p">]</span><span class="c1"># docker images</span>
<span class="n">REPOSITORY</span> <span class="n">TAG</span> <span class="n">IMAGE</span> <span class="n">ID</span> <span class="n">CREATED</span> <span class="n">SIZE</span>
<span class="n">ekozhan</span><span class="o">/</span><span class="n">mysql</span> <span class="mf">0.1</span> <span class="n">cde3f783415f</span> <span class="mi">5</span> <span class="n">seconds</span> <span class="n">ago</span> <span class="mi">538</span><span class="n">MB</span>
<span class="n">mysql</span> <span class="mf">8.0</span> <span class="mf">8e85</span><span class="n">dd5c3255</span> <span class="mi">3</span> <span class="n">weeks</span> <span class="n">ago</span> <span class="mi">544</span><span class="n">MB</span>
<span class="n">wurstmeister</span><span class="o">/</span><span class="n">kafka</span> <span class="n">latest</span> <span class="mi">40094</span><span class="n">a582680</span> <span class="mi">2</span> <span class="n">months</span> <span class="n">ago</span> <span class="mi">435</span><span class="n">MB</span>
<span class="n">wurstmeister</span><span class="o">/</span><span class="n">zookeeper</span> <span class="n">latest</span> <span class="mi">3</span><span class="n">f43f72cb283</span> <span class="mi">21</span> <span class="n">months</span> <span class="n">ago</span> <span class="mi">510</span><span class="n">MB</span>
<span class="p">[</span><span class="n">root</span><span class="nd">@localhost</span> <span class="n">mysql</span><span class="p">]</span><span class="c1"># docker run --name mysql3306 -e MYSQL_ROOT_PASSWORD=123456 -d -p 3308:3308 cde3f783415f docker-entrypoint.sh mysqld</span>
<span class="n">dd344b94113c301930b5b0a5184ed41b4679e7a5b4e45adb69f894df1a870417</span>
<span class="p">[</span><span class="n">root</span><span class="nd">@localhost</span> <span class="n">mysql</span><span class="p">]</span><span class="c1"># docker ps</span>
<span class="n">CONTAINER</span> <span class="n">ID</span> <span class="n">IMAGE</span> <span class="n">COMMAND</span> <span class="n">CREATED</span> <span class="n">STATUS</span> <span class="n">PORTS</span> <span class="n">NAMES</span>
<span class="n">dd344b94113c</span> <span class="n">cde3f783415f</span> <span class="s2">&quot;docker-entrypoint.s…&quot;</span> <span class="mi">4</span> <span class="n">seconds</span> <span class="n">ago</span> <span class="n">Up</span> <span class="mi">3</span> <span class="n">seconds</span> <span class="mf">0.0</span><span class="o">.</span><span class="mf">0.0</span><span class="p">:</span><span class="mi">3308</span><span class="o">-&gt;</span><span class="mi">3308</span><span class="o">/</span><span class="n">tcp</span> <span class="n">mysql3306</span>
<span class="n">cc72f2b081b9</span> <span class="n">mysql</span><span class="p">:</span><span class="mf">8.0</span> <span class="s2">&quot;docker-entrypoint.s…&quot;</span> <span class="mi">3</span> <span class="n">weeks</span> <span class="n">ago</span> <span class="n">Up</span> <span class="mi">15</span> <span class="n">minutes</span> <span class="mf">0.0</span><span class="o">.</span><span class="mf">0.0</span><span class="p">:</span><span class="mi">3306</span><span class="o">-&gt;</span><span class="mi">3306</span><span class="o">/</span><span class="n">tcp</span><span class="p">,</span> <span class="mi">33060</span><span class="o">/</span><span class="n">tcp</span> <span class="n">mysql</span><span class="o">-</span><span class="n">docker</span>
</pre></div>
</div>
</div>
</div>
<div class="section" id="id4">
<h2>Docker: 限制容器可用的内存<a class="headerlink" href="#id4" title="Permalink to this headline"></a></h2>
<p><a class="reference external" href="https://www.cnblogs.com/sparkdev/p/8032330.html">https://www.cnblogs.com/sparkdev/p/8032330.html</a></p>
</div>
<div class="section" id="demo">
Expand All @@ -288,8 +327,8 @@ <h2>Demo<a class="headerlink" href="#demo" title="Permalink to this headline">¶
</pre></div>
</div>
</div>
<div class="section" id="id4">
<h2>docker-compose<a class="headerlink" href="#id4" title="Permalink to this headline"></a></h2>
<div class="section" id="id5">
<h2>docker-compose<a class="headerlink" href="#id5" title="Permalink to this headline"></a></h2>
<p><strong>注意</strong></p>
<p>项目中使用最多的就是 docker-compose</p>
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span>
Expand All @@ -299,8 +338,8 @@ <h2>docker-compose<a class="headerlink" href="#id4" title="Permalink to this hea
</pre></div>
</div>
</div>
<div class="section" id="id5">
<h2>相关资料<a class="headerlink" href="#id5" title="Permalink to this headline"></a></h2>
<div class="section" id="id6">
<h2>相关资料<a class="headerlink" href="#id6" title="Permalink to this headline"></a></h2>
<p><a class="reference external" href="https://yeasy.gitbooks.io/docker_practice/">https://yeasy.gitbooks.io/docker_practice/</a></p>
<p><a class="reference external" href="https://www.runoob.com/docker/docker-compose.html">https://www.runoob.com/docker/docker-compose.html</a></p>
</div>
Expand Down
36 changes: 21 additions & 15 deletions docs/_build/html/git.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,21 +255,27 @@ <h2>git rebase 用法<a class="headerlink" href="#git-rebase" title="Permalink t
<blockquote>
<div><p>git rebase -i HEAD~N</p>
</div></blockquote>
<ol class="simple">
<li><p>i 键入</p></li>
</ol>
<p>pick XXX xxx</p>
<p>需要改成 s XXX xxx</p>
<p>不需要改成 d XXX xxx</p>
<p>wq</p>
<ol class="simple">
<li><p>i 键入</p></li>
</ol>
<p>修改 Commit</p>
<p>wq</p>
<ol class="simple">
<li><p>推送</p></li>
</ol>
<p>N 是指要压缩的最近的 commit</p>
<ul class="simple">
<li><p>筛选需要合并的 commit</p></li>
</ul>
<p>命令输入后会切换到编辑框，vi 命令操作</p>
<p>第一行还是 pick 开头</p>
<p>后面需要的 commit message 前缀改成 s，不需要的前缀改成 d，如下图所示</p>
<p><img alt="rebase-1" src="_images/rebase-1.png" /></p>
<p>修改完毕后 wq 保存</p>
<ul class="simple">
<li><p>修改 commit message</p></li>
</ul>
<p>此时会切换至 commit message 合并页面，依然是 vi 命令，将不需要的 commit message 用 # 注释即可，wq 保存</p>
<p><img alt="rebase-2" src="_images/rebase-2.png" /></p>
<ul class="simple">
<li><p>强制推送</p></li>
</ul>
<p><code class="docutils literal notranslate"><span class="pre">git</span> <span class="pre">push</span> <span class="pre">–f</span></code></p>
<p>由于服务器上已经存在该分支，所以需要强制推送，注意，无法强制推送至受保护的分支</p>
<p><img alt="rebase-3" src="_images/rebase-3.png" /></p>
<p><em>注意：在开发过程中，建议 checkout 新分支进行开发，开发完毕后，merge rquest 给分支负责人进行合并，merge request 的时候勾选 squash 即可由 gitlab 帮我们进行分支合并</em></p>
</div>
<div class="section" id="git-commit">
<h2>git commit 规范<a class="headerlink" href="#git-commit" title="Permalink to this headline"></a></h2>
Expand Down
6 changes: 3 additions & 3 deletions docs/_build/html/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,10 +207,10 @@ <h1>工作中的技能经验总结<a class="headerlink" href="#id1" title="Perma
<li class="toctree-l2"><a class="reference internal" href="docker.html#id2">docker 同时删除停止的容器</a></li>
<li class="toctree-l2"><a class="reference internal" href="docker.html#dockerfile">Dockerfile 编写样例</a></li>
<li class="toctree-l2"><a class="reference internal" href="docker.html#docker-save-docker-export">Docker save 与 Docker export 的区别</a></li>
<li class="toctree-l2"><a class="reference internal" href="docker.html#id3">Docker: 限制容器可用的内存</a></li>
<li class="toctree-l2"><a class="reference internal" href="docker.html#id4">Docker: 限制容器可用的内存</a></li>
<li class="toctree-l2"><a class="reference internal" href="docker.html#demo">Demo</a></li>
<li class="toctree-l2"><a class="reference internal" href="docker.html#id4">docker-compose</a></li>
<li class="toctree-l2"><a class="reference internal" href="docker.html#id5">相关资料</a></li>
<li class="toctree-l2"><a class="reference internal" href="docker.html#id5">docker-compose</a></li>
<li class="toctree-l2"><a class="reference internal" href="docker.html#id6">相关资料</a></li>
<li class="toctree-l2"><a class="reference internal" href="docker.html#centos8-docker">CentOS8 安装 docker 遇到的报错</a></li>
</ul>
</li>
Expand Down

0 comments on commit 033be9f

Please sign in to comment.