From 915e4b8e69c67bd687045caec4a20295ed19fa0c Mon Sep 17 00:00:00 2001 From: wenyongda Date: Mon, 19 May 2025 13:26:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _config.butterfly.yml | 2 +- package.json | 5 +- source/_posts/Docker.md | 72 ++++++++++++++--------------- source/_posts/Pug.md | 5 ++ yarn.lock | 100 ++++------------------------------------ 5 files changed, 53 insertions(+), 131 deletions(-) create mode 100644 source/_posts/Pug.md diff --git a/_config.butterfly.yml b/_config.butterfly.yml index 094b530..8578909 100644 --- a/_config.butterfly.yml +++ b/_config.butterfly.yml @@ -39,7 +39,7 @@ highlight_shrink: false #true代码框不展开，需点击 '>' 打开 false展 code_word_wrap: true index_img: https://gcore.jsdelivr.net/gh/volantis-x/cdn-wallpaper/abstract/BBC19066-E176-47C2-9D22-48C81EE5DF6B.jpeg archive_img: https://gcore.jsdelivr.net/gh/volantis-x/cdn-wallpaper/abstract/67239FBB-E15D-4F4F-8EE8-0F1C9F3C4E7C.jpeg - +post_asset_folder: true # Footer设置 since: 2022 footer_custom_text: Hi, welcome to my Xiaowen blog! diff --git a/package.json b/package.json index dd63243..cbf14c3 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "dependencies": { "cheerio": "^0.22.0", "hexo": "^6.3.0", - "hexo-asset-image": "^1.0.0", + "hexo-asset-img": "^1.2.0", "hexo-deployer-git": "^3.0.0", "hexo-generator-archive": "^2.0.0", "hexo-generator-category": "^2.0.0", @@ -31,5 +31,6 @@ "hexo-theme-volantis": "^5.7.6", "hexo-wordcount": "^6.0.1", "save": "^2.9.0" - } + }, + "devDependencies": {} } diff --git a/source/_posts/Docker.md b/source/_posts/Docker.md index 856aed8..f8dde83 100644 --- a/source/_posts/Docker.md +++ b/source/_posts/Docker.md @@ -27,7 +27,7 @@ CentOS占CPU Docker CPU引擎占用低 ```shell curl -fsSL https://get.docker.com | bash -s docker --mirror Aliyun -# 另一种方式 +# 另一种方式 curl -sSL https://get.daocloud.io/docker | sh # 如上述两种方式都不行 yum-config-manager --add-repo http://mirrors.aliyun.com/docker-ce/linux/centos/docker-ce.repo @@ -49,7 +49,7 @@ dnf list docker-ce --showduplicates | sort -r # 安装Docker CE dnf install docker-ce-3:24.0.7-1.el9 -y # 镜像源配置 -vim /etc/docker/daemon.json +vim /etc/docker/daemon.json ``` ## Ubuntu @@ -99,7 +99,7 @@ permission denied while trying to connect to the Docker daemon socket at unix:// ```bash cat /etc/group | grep docker - + docker:x:988: ``` @@ -180,7 +180,7 @@ sed -e 's/"//g' -e "s/name:/$1:/g" -e "s/{count:/$1总版本数-/" docker-tags脚本编辑好之后，需要通过chmod修改文件权限才可以执行。在权限修改完成之后，就可以使用docker-tags脚本来查询相关镜像的最近版本信息了。 ```shell -chmod 777 docker-tags +chmod 777 docker-tags ./docker-tags ubuntu ``` @@ -189,7 +189,7 @@ chmod 777 docker-tags ```shell # 第一步：新建或编辑daemon.json vim /etc/docker/daemon.json - + # 第二步：daemon.json中编辑如下 { "registry-mirrors": [ @@ -204,10 +204,10 @@ vim /etc/docker/daemon.json "https://docker.xiaogenban1993.com" ] } - + # 第三步：重启docker systemctl restart docker.service - + # 第四步：执行docker info查看是否修改成功 docker info @@ -259,7 +259,7 @@ docker inspect ### 运行容器 ```shell -# 第一个8080是外部海豚上的 第二个8080是内部集装箱上的 +# 第一个8080是外部海豚上的 第二个8080是内部集装箱上的 docker run -p 8080:8080 ``` @@ -331,7 +331,7 @@ docker inspect ```shell docker pull hello-world docker pull nginx -docker save -o images.tar nginx hello-world +docker save -o images.tar nginx hello-world ll images.tar ``` @@ -343,7 +343,7 @@ ll images.tar ```shell docker load -i images.tar -docker images +docker images ``` ## Docker 容器快照的导出和导入 @@ -458,7 +458,7 @@ docker start 修改线上容器--restart参数值 ```shell -docker update --restart=no [容器名] +docker update --restart=no [容器名] docker update --restart=always [容器名] docker update --restart=on-failure:3 [容器名] ``` @@ -570,7 +570,7 @@ Dockerfile 是一个用来构建镜像的文本文件，文本内容包含了一 docker build -t nginx:v3 . ``` -![img](F:\source\repos\XiaodaBlogSource\source\_posts\Docker\dockerfile2.png) +![img](./Docker/dockerfile2.png) ### 上下文路径 @@ -590,26 +590,26 @@ docker build -t nginx:v3 . ### 指令详解 -| Dockerfile 指令 | 说明 | -| --------------- | ------------------------------------------------------------ | -| FROM | 指定基础镜像，用于后续的指令构建。 | -| MAINTAINER | 指定Dockerfile的作者/维护者。（已启用，推荐使用LABEL指令） | -| LABEL | 添加镜像的元数据，使用键值对的形式。 | -| RUN | 在构建过程中在镜像中执行命令。 | -| CMD | 指定容器创建时的默认命令。（可以被覆盖） | -| ENTRYPOINT | 设置容器创建时的主要命令。（不可被覆盖） | -| EXPOSE | 声明容器运行时监听的特定网络端口。 | -| ENV | 在容器内部设置环境变量。 | -| ADD | 将文件、目录或远程URL复制到镜像中。 | -| COPY | 将文件或目录复制到镜像中。 | -| VOLUME | 为容器创建挂载点或声明卷。 | -| WORKDIR | 设置后续指令的工作目录。 | -| USER | 指定后续指令的用户上下文。 | +| Dockerfile 指令 | 说明 | +| --------------- | ------------------------------------------------------------------ | +| FROM | 指定基础镜像，用于后续的指令构建。 | +| MAINTAINER | 指定Dockerfile的作者/维护者。（已启用，推荐使用LABEL指令） | +| LABEL | 添加镜像的元数据，使用键值对的形式。 | +| RUN | 在构建过程中在镜像中执行命令。 | +| CMD | 指定容器创建时的默认命令。（可以被覆盖） | +| ENTRYPOINT | 设置容器创建时的主要命令。（不可被覆盖） | +| EXPOSE | 声明容器运行时监听的特定网络端口。 | +| ENV | 在容器内部设置环境变量。 | +| ADD | 将文件、目录或远程URL复制到镜像中。 | +| COPY | 将文件或目录复制到镜像中。 | +| VOLUME | 为容器创建挂载点或声明卷。 | +| WORKDIR | 设置后续指令的工作目录。 | +| USER | 指定后续指令的用户上下文。 | | ARG | 定义在构建过程中传递给构建器的变量，可使用"docker build"命令设置。 | -| ONBUILD | 当该镜像被用作另一个构建过程的基础时，添加触发器。 | -| STOPSIGNAL | 设置发送给容器以退出的系统调用信号。 | -| HEALTHCHECK | 定义周期性检查容器健康状态的命令。 | -| SHELL | 覆盖Docker中默认的shell，用于RUN、CMD和ENTRYPOINT。 | +| ONBUILD | 当该镜像被用作另一个构建过程的基础时，添加触发器。 | +| STOPSIGNAL | 设置发送给容器以退出的系统调用信号。 | +| HEALTHCHECK | 定义周期性检查容器健康状态的命令。 | +| SHELL | 覆盖Docker中默认的shell，用于RUN、CMD和ENTRYPOINT。 | #### COPY @@ -847,7 +847,7 @@ redis-server /usr/local/etc/redis/redis.conf # 如报错 mkdir -p /usr/redis/bin # 测试连接 -redis-cli -a +redis-cli -a ``` redis-slave1 @@ -1049,7 +1049,7 @@ docker run \ ```shell mkdir -p /usr/local/docker/mysql57 -# 宿主机创建配置文件目录映射到容器 +# 宿主机创建配置文件目录映射到容器 mkdir -p /usr/local/docker/mysql57/conf #(需要在此目录下创建"conf.d"、"mysql.conf.d"两个目录) mkdir -p /usr/local/docker/mysql57/conf/conf.d # (建议在此目录创建my.cnf文件并进行相关MySQL配置) mkdir -p /usr/local/docker/mysql57/conf/mysql.conf.d @@ -1078,14 +1078,14 @@ mysql -uroot -p # 查看 /etc/mysql/my.cnf 文件权限 ls -l /etc/mysql/my.cnf # 如果看到以下输出 -# -rwxrwxrwx 1 root root 1234 Jan 1 00:00 /etc/mysql/my.cnf +# -rwxrwxrwx 1 root root 1234 Jan 1 00:00 /etc/mysql/my.cnf # 那么说明该配置文件确实是对所有人开放了读、写和执行权利。 # 接着我们需要修改这个文件的权限，使其只有root用户有读写权，其他用户只有读的权限： chmod 644 /etc/mysql/my.cnf # 再次使用 ls -l命令查看'/etc/mysql/my.cnf'的权限 ls -l /etc/mysql/my.cnf # 看到以下输出，则修改成功 -# -rw-r--r-- 1 root root 1234 Jan 1 00:00 /etc/mysql/my.cnf +# -rw-r--r-- 1 root root 1234 Jan 1 00:00 /etc/mysql/my.cnf ``` ## Docker 安装 Redis 7 @@ -1439,7 +1439,7 @@ docker run -p 9000:9000 -p 9001:9001 \ -v /usr/local/docker/minio/config:/root/.minio \ minio/minio server \ /data \ ---console-address ":9001" +--console-address ":9001" ``` diff --git a/source/_posts/Pug.md b/source/_posts/Pug.md new file mode 100644 index 0000000..e63fc5d --- /dev/null +++ b/source/_posts/Pug.md @@ -0,0 +1,5 @@ +--- +title: Pug +date: 2025-05-19 13:20:34 +tags: +--- diff --git a/yarn.lock b/yarn.lock index 554f496..418b159 100644 --- a/yarn.lock +++ b/yarn.lock @@ -403,17 +403,6 @@ character-parser@^2.2.0: dependencies: is-regex "^1.0.3" -cheerio@^0.19.0: - version "0.19.0" - resolved "https://registry.npmmirror.com/cheerio/-/cheerio-0.19.0.tgz" - integrity sha512-Fwcm3zkR37STnPC8FepSHeSYJM5Rd596TZOcfDUdojR4Q735aK1Xn+M+ISagNneuCwMjK28w4kX+ETILGNT/UQ== - dependencies: - css-select "~1.0.0" - dom-serializer "~0.1.0" - entities "~1.1.1" - htmlparser2 "~3.8.1" - lodash "^3.2.0" - cheerio@^0.22.0: version "0.22.0" resolved "https://registry.npmmirror.com/cheerio/-/cheerio-0.22.0.tgz" @@ -586,16 +575,6 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.3: shebang-command "^2.0.0" which "^2.0.1" -css-select@~1.0.0: - version "1.0.0" - resolved "https://registry.npmmirror.com/css-select/-/css-select-1.0.0.tgz" - integrity sha512-/xPlD7betkfd7ChGkLGGWx5HWyiHDOSn7aACLzdH0nwucPvB0EAm8hMBm7Xn7vGfAeRRN7KZ8wumGm8NoNcMRw== - dependencies: - boolbase "~1.0.0" - css-what "1.0" - domutils "1.4" - nth-check "~1.0.0" - css-select@~1.2.0: version "1.2.0" resolved "https://registry.npmmirror.com/css-select/-/css-select-1.2.0.tgz" @@ -606,11 +585,6 @@ css-select@~1.2.0: domutils "1.5.1" nth-check "~1.0.1" -css-what@1.0: - version "1.0.0" - resolved "https://registry.npmmirror.com/css-what/-/css-what-1.0.0.tgz" - integrity sha512-60SUMPBreXrLXgvpM8kYpO0AOyMRhdRlXFX5BMQbZq1SIJCyNE56nqFQhmvREQdUJpedbGRYZ5wOyq3/F6q5Zw== - css-what@2.1: version "2.1.3" resolved "https://registry.npmmirror.com/css-what/-/css-what-2.1.3.tgz" @@ -780,13 +754,6 @@ domexception@^4.0.0: dependencies: webidl-conversions "^7.0.0" -domhandler@2.3: - version "2.3.0" - resolved "https://registry.npmmirror.com/domhandler/-/domhandler-2.3.0.tgz" - integrity sha512-q9bUwjfp7Eif8jWxxxPSykdRZAb6GkguBGSgvvCrhI9wB71W2K/Kvv4E61CF/mcCfnVJDeDWx/Vb/uAqbDj6UQ== - dependencies: - domelementtype "1" - domhandler@^2.3.0: version "2.4.2" resolved "https://registry.npmmirror.com/domhandler/-/domhandler-2.4.2.tgz" @@ -813,14 +780,7 @@ dompurify@^3.0.3: resolved "https://registry.npmmirror.com/dompurify/-/dompurify-3.0.6.tgz" integrity sha512-ilkD8YEnnGh1zJ240uJsW7AzE+2qpbOUYjacomn3AvJ6J4JhKGSZ2nh4wUIXPZrEPppaCLx5jFe8T89Rk8tQ7w== -domutils@1.4: - version "1.4.3" - resolved "https://registry.npmmirror.com/domutils/-/domutils-1.4.3.tgz" - integrity sha512-ZkVgS/PpxjyJMb+S2iVHHEZjVnOUtjGp0/zstqKGTE9lrZtNHlNQmLwP/lhLMEApYbzc08BKMx9IFpKhaSbW1w== - dependencies: - domelementtype "1" - -domutils@1.5, domutils@1.5.1: +domutils@1.5.1: version "1.5.1" resolved "https://registry.npmmirror.com/domutils/-/domutils-1.5.1.tgz" integrity sha512-gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw== @@ -881,12 +841,7 @@ ent@^2.2.0: resolved "https://registry.npmmirror.com/ent/-/ent-2.2.0.tgz" integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA== -entities@1.0: - version "1.0.0" - resolved "https://registry.npmmirror.com/entities/-/entities-1.0.0.tgz" - integrity sha512-LbLqfXgJMmy81t+7c14mnulFHJ170cM6E+0vMXR9k/ZiZwgX8i5pNgjTCX3SO4VeUsFLV+8InixoretwU+MjBQ== - -entities@^1.1.1, entities@^1.1.2, entities@~1.1.1: +entities@^1.1.1, entities@~1.1.1: version "1.1.2" resolved "https://registry.npmmirror.com/entities/-/entities-1.1.2.tgz" integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== @@ -1291,13 +1246,10 @@ hasown@^2.0.0: dependencies: function-bind "^1.1.2" -hexo-asset-image@^1.0.0: - version "1.0.0" - resolved "https://registry.npmmirror.com/hexo-asset-image/-/hexo-asset-image-1.0.0.tgz" - integrity sha512-jkuUJNPRMH6v7HqzP2BAwEZavMzVxNWhl8jZl9BmFYB22/aq2+zixGIhV4vedI9cLPydjn9DfII41/MMXtzJTA== - dependencies: - cheerio "^0.19.0" - entities "^1.1.2" +hexo-asset-img@^1.2.0: + version "1.2.0" + resolved "https://registry.npmmirror.com/hexo-asset-img/-/hexo-asset-img-1.2.0.tgz#d6d816fbea47ff3da97da13bce58bd0314bdaaee" + integrity sha512-PfjFF8DvG22KZ9ZldzpCFJUerH+IJ7e4ARw9BsD3PtJsAbYJGLQfLt/XFnel/r9d2dDYjMlQf1urFdLirseqEA== hexo-bunyan@^1.0.0: version "1.0.0" @@ -1622,17 +1574,6 @@ htmlparser2@^9.0.0: domutils "^3.1.0" entities "^4.5.0" -htmlparser2@~3.8.1: - version "3.8.3" - resolved "https://registry.npmmirror.com/htmlparser2/-/htmlparser2-3.8.3.tgz" - integrity sha512-hBxEg3CYXe+rPIua8ETe7tmG3XDn9B0edOE/e9wH2nLczxzgdu0m0aNHY+5wFZiviLWLdANPJTssa92dMcXQ5Q== - dependencies: - domelementtype "1" - domhandler "2.3" - domutils "1.5" - entities "1.0" - readable-stream "1.1" - http-errors@2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz" @@ -1676,7 +1617,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3: +inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: version "2.0.4" resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -1874,11 +1815,6 @@ is-wsl@^2.2.0: dependencies: is-docker "^2.0.0" -isarray@0.0.1: - version "0.0.1" - resolved "https://registry.npmmirror.com/isarray/-/isarray-0.0.1.tgz" - integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== - isarray@1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz" @@ -2072,11 +2008,6 @@ lodash.some@^4.4.0: resolved "https://registry.npmmirror.com/lodash.some/-/lodash.some-4.6.0.tgz" integrity sha512-j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ== -lodash@^3.2.0: - version "3.10.1" - resolved "https://registry.npmmirror.com/lodash/-/lodash-3.10.1.tgz" - integrity sha512-9mDDwqVIma6OZX79ZlDACZl8sBm0TEnkf99zV3iMA4GzkIT/9hiqP5mY0HoT1iNLCrKc/R1HByV+yJfRWVJryQ== - lower-case@^2.0.2: version "2.0.2" resolved "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz" @@ -2345,7 +2276,7 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -nth-check@~1.0.0, nth-check@~1.0.1: +nth-check@~1.0.1: version "1.0.2" resolved "https://registry.npmmirror.com/nth-check/-/nth-check-1.0.2.tgz" integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg== @@ -2690,16 +2621,6 @@ range-parser@~1.2.1: resolved "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== -readable-stream@1.1: - version "1.1.14" - resolved "https://registry.npmmirror.com/readable-stream/-/readable-stream-1.1.14.tgz" - integrity sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - readable-stream@3, readable-stream@^3.1.1: version "3.6.0" resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz" @@ -3045,11 +2966,6 @@ string_decoder@^1.1.1: dependencies: safe-buffer "~5.2.0" -string_decoder@~0.10.x: - version "0.10.31" - resolved "https://registry.npmmirror.com/string_decoder/-/string_decoder-0.10.31.tgz" - integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ== - string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz"