From f1897688091243901bc1290c92720a40ffad9f29 Mon Sep 17 00:00:00 2001
From: zhouying <1718308415@qq.com>
Date: Thu, 2 Nov 2023 12:40:25 +0800
Subject: [PATCH 1/2] addDockerCreate

---
 docker/cli.md | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/docker/cli.md b/docker/cli.md
index 35f09ec..aa05333 100644
--- a/docker/cli.md
+++ b/docker/cli.md
@@ -18,4 +18,32 @@ docker stop {容器名称或者Id}
 docker restart {容器名称或者Id}
 ```
 
-### 
\ No newline at end of file
+### 查看镜像
+```
+docker images
+```
+
+### 根据镜像创建容器
+```
+docker run -it --name {容器名} -v {容器所在路径}:/app -p {端口号1}:80 -p {端口号2}:1883 {镜像名} {容器启动文件名}.dll
+```
+
+### 删除文件
+```
+docker rmi {文件名}
+```
+
+### 文件打包为压缩包
+```
+tar cfz {生成的压缩文件名.tgz}  {需要压缩的文件}
+```
+
+### 查看磁盘使用率
+```
+df -h
+```
+
+### 查看目录下每个文件夹的大小
+```
+du -h -d1 {路径}
+```
\ No newline at end of file

From 01a42f8435ea9366e9fbee8981349962a10ff4e0 Mon Sep 17 00:00:00 2001
From: zhouying <1718308415@qq.com>
Date: Thu, 2 Nov 2023 12:56:08 +0800
Subject: [PATCH 2/2] change

---
 docker/cli.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docker/cli.md b/docker/cli.md
index f0e72bc..6180030 100644
--- a/docker/cli.md
+++ b/docker/cli.md
@@ -18,7 +18,6 @@ docker stop {容器名称或者Id}
 docker restart {容器名称或者Id}
 ```
 
-<<<<<<< HEAD
 ### 查看镜像
 ```
 docker images
@@ -48,7 +47,7 @@ df -h
 ```
 du -h -d1 {路径}
 ```
-=======
+
 ### 进入容器
 
 ```bash
@@ -62,4 +61,3 @@ docker build -t [imagesName] -f Dockerfile .
 ```
 
 ps:命令要在 Dockerfile 在的目录下执行
->>>>>>> 7f7fc1406d4278f4b5c10b95bbe521e61f3b63db