bug: fix docker/compose#10958

errpunk · Jan 27, 2024 · f75a7b6 · f75a7b6
1 parent 0a63d87
commit f75a7b6
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/cli/Dockerfile b/cli/Dockerfile
@@ -1,7 +1,9 @@
 FROM node:18-alpine
 
-RUN apk update && \
-    apk add --no-cache docker-cli docker-cli-compose
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories && \
+    apk update && \
+    apk add --no-cache docker-cli docker-cli-compose && \
+    npm config set registry http://registry.npm.taobao.org
 
 WORKDIR /letsencrypt-docker-compose/cli
 COPY package*.json ./

diff --git a/cli/package-lock.json b/cli/package-lock.json
diff --git a/cli/package.json b/cli/package.json
@@ -22,6 +22,7 @@
   },
   "dependencies": {
     "handlebars": "^4.7.7",
-    "inquirer": "9.1.4"
+    "inquirer": "9.1.4",
+    "json-nd": "^1.0.0"
   }
 }
diff --git a/cli/src/shell-commands.js b/cli/src/shell-commands.js
@@ -1,5 +1,6 @@
 import { promisify } from 'util';
 import { exec } from 'child_process';
+import { NdJson } from 'json-nd';
 
 const execute = promisify(exec);
 
@@ -20,7 +21,7 @@ const runCommand = async (command, logOutput = true) => {
 
 export const isNginxServiceRunning = async () => {
   const { stdout } = await runCommand('docker compose ps --format json', false);
-  const containers = JSON.parse(stdout);
+  const containers = NdJson.parse(stdout);
   return !!containers.find(
     (container) =>
       container.Service === 'nginx' && container.State === 'running'