zixulu 1.76.0 → 1.76.1

package/dist/index.js

@@ -4797,6 +4797,20 @@ async function test() {
     console.log(isSudo);
     console.log(process.argv);
 }
+async function pullDockerImage({ image, sha256 }) {
+    const match = image.match(/^(.+):(.+)$/);
+    image = match ? match[1] : image;
+    const tag = match ? match[2] : "latest";
+    sha256 = sha256?.replace(/^@?sha256:/, "");
+    await spawnAsync(`docker pull ${image}@sha256:${sha256}`, {
+        shell: true,
+        stdio: "inherit"
+    });
+    await spawnAsync(`docker tag ${image}@sha256:${sha256} ${image}:${tag}`, {
+        shell: true,
+        stdio: "inherit"
+    });
+}
 async function updateDockerCompose() {
     const dir = await readdir(".");
     const file = dir.find((item)=>"docker-compose.yml" === item || "docker-compose.yaml" === item);
@@ -4805,10 +4819,21 @@ async function updateDockerCompose() {
     const data = yaml_0.parse(content);
     const images = Object.values(data.services).map((service)=>service.image);
     consola_0.start("开始更新镜像");
-    for (const image of images)await spawnAsync(`docker pull ${image}`, {
-        shell: true,
-        stdio: "inherit"
-    });
+    for (const image of images){
+        const match = image.match(/^(.+):(.+)$/);
+        const name = match ? match[1] : image;
+        const tag = match ? match[2] : "latest";
+        const response = await node_fetch(`https://hub.docker.com/v2/repositories/${name}/tags/${tag}`, {
+            agent: agent
+        });
+        const data = await response.json();
+        const sha256 = data.digest;
+        await pullDockerImage({
+            image,
+            sha256
+        });
+        consola_0.info(`更新镜像 ${image} 完成`);
+    }
     consola_0.success("更新镜像完成");
     await spawnAsync("docker compose down", {
         shell: true,
@@ -5209,16 +5234,6 @@ async function gdm() {
     await writeFile(".gdm/gdm.mjs", gdm_script);
     await verdaccio();
 }
-async function pullDockerImage({ image, sha256 }) {
-    const match = image.match(/^(.+):(.+)$/);
-    image = match ? match[1] : image;
-    const tag = match ? match[2] : "latest";
-    sha256 = sha256?.replace(/^@?sha256:/, "");
-    if (sha256) {
-        await spawnAsync(`docker pull ${image}@sha256:${sha256}`);
-        await spawnAsync(`docker tag ${image}@sha256:${sha256} ${image}:${tag}`);
-    } else await spawnAsync(`docker pull ${image}:${tag}`);
-}
 async function removeOpenWith(name, { file, folder, background }) {
     if (!file && !folder && !background) throw new Error("至少选择一个");
     let reg = `\ufeffWindows Registry Editor Version 5.00
@@ -5420,7 +5435,7 @@ program.command("replace-commit-message").alias("rcm").description("替换所有
 program.command("gdm").description("同步 geshu-docker-management").action(gdm);
 program.command("add-open-with").alias("aow").description("添加打开文件的脚本").argument("path", "程序路径").option("--no-file", "是否不添加文件关联").option("--no-folder", "是否不添加文件夹关联").option("--no-background", "是否不添加文件夹空白处关联").action(addOpenWith);
 program.command("remove-open-with").alias("row").description("删除打开文件的脚本").argument("name", "脚本名称").option("--no-file", "是否不删除文件关联").option("--no-folder", "是否不删除文件夹关联").option("--no-background", "是否不删除文件夹空白处关联").action(removeOpenWith);
-program.command("pull-docker-image").alias("pd").description("拉取 docker 镜像").argument("image", "镜像名称").argument("[sha256]", "镜像 sha256").action((image, sha256)=>pullDockerImage({
+program.command("pull-docker-image").alias("pd").description("拉取 docker 镜像").argument("image", "镜像名称").argument("sha256", "镜像 sha256").action((image, sha256)=>pullDockerImage({
         image,
         sha256
     }));