bugfix: fix the npm mirror in angular astro docusaurus express hexo next nginx

cbluebird · cbluebird · commit 923fa187b6cb · 2024-11-18T17:26:55.000+08:00
diff --git a/Framework/angular/update_cn_dockerfile.sh b/Framework/angular/update_cn_dockerfile.sh
@@ -5,8 +5,14 @@ echo "DOCKERFILE: $DOCKERFILE"
 TMP_DOCKERFILE="${DOCKERFILE}tmp"
 cp "$DOCKERFILE" "$TMP_DOCKERFILE"
 
+sed -i '$i\
+USER root' "$TMP_DOCKERFILE"
+
 sed -i '$i\
 COPY /OS/debian-ssh/debian.sources /etc/apt/sources.list.d/debian.sources' "$TMP_DOCKERFILE"
 
 sed -i '$i\
-RUN npm config set -g registry https://registry.npmmirror.com' "$TMP_DOCKERFILE"
+USER devbox' "$TMP_DOCKERFILE"
+
+sed -i '$i\
+RUN npm config set registry https://registry.npmmirror.com' "$TMP_DOCKERFILE"
diff --git a/Framework/angular/v18/Dockerfile b/Framework/angular/v18/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/labring-actions/devbox/node.js-20:1323f9
+FROM ghcr.io/labring-actions/devbox/node.js-18:a49ab6
 
 USER root
 RUN cd /home/devbox/project && \
@@ -13,5 +13,4 @@ USER devbox
 RUN cd /home/devbox/project && \
 npm install 
 
-USER root
 RUN mkdir -p /home/devbox/.devbox
diff --git a/Framework/astro/4.10.0/Dockerfile b/Framework/astro/4.10.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/labring-actions/devbox/node.js-20:1323f9
+FROM ghcr.io/labring-actions/devbox/node.js-18:a49ab6
 
 USER root
 RUN cd /home/devbox/project && \
@@ -13,5 +13,4 @@ USER devbox
 RUN cd /home/devbox/project && \
 npm install 
 
-USER root
 RUN mkdir -p /home/devbox/.devbox
diff --git a/Framework/astro/update_cn_dockerfile.sh b/Framework/astro/update_cn_dockerfile.sh
@@ -5,8 +5,14 @@ echo "DOCKERFILE: $DOCKERFILE"
 TMP_DOCKERFILE="${DOCKERFILE}tmp"
 cp "$DOCKERFILE" "$TMP_DOCKERFILE"
 
+sed -i '$i\
+USER root' "$TMP_DOCKERFILE"
+
 sed -i '$i\
 COPY /OS/debian-ssh/debian.sources /etc/apt/sources.list.d/debian.sources' "$TMP_DOCKERFILE"
 
 sed -i '$i\
-RUN npm config set -g registry https://registry.npmmirror.com' "$TMP_DOCKERFILE"
+USER devbox' "$TMP_DOCKERFILE"
+
+sed -i '$i\
+RUN npm config set registry https://registry.npmmirror.com' "$TMP_DOCKERFILE"
diff --git a/Framework/docusaurus/3.5.2/Dockerfile b/Framework/docusaurus/3.5.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/labring-actions/devbox/node.js-20:1323f9
+FROM ghcr.io/labring-actions/devbox/node.js-18:a49ab6
 
 USER root
 RUN cd /home/devbox/project && \
@@ -14,5 +14,4 @@ RUN cd /home/devbox/project && \
 npm install && \
 npx docusaurus build
  
-USER root
 RUN mkdir -p /home/devbox/.devbox
diff --git a/Framework/docusaurus/update_cn_dockerfile.sh b/Framework/docusaurus/update_cn_dockerfile.sh
@@ -5,8 +5,14 @@ echo "DOCKERFILE: $DOCKERFILE"
 TMP_DOCKERFILE="${DOCKERFILE}tmp"
 cp "$DOCKERFILE" "$TMP_DOCKERFILE"
 
+sed -i '$i\
+USER root' "$TMP_DOCKERFILE"
+
 sed -i '$i\
 COPY /OS/debian-ssh/debian.sources /etc/apt/sources.list.d/debian.sources' "$TMP_DOCKERFILE"
 
 sed -i '$i\
-RUN npm config set -g registry https://registry.npmmirror.com' "$TMP_DOCKERFILE"
+USER devbox' "$TMP_DOCKERFILE"
+
+sed -i '$i\
+RUN npm config set registry https://registry.npmmirror.com' "$TMP_DOCKERFILE"
diff --git a/Framework/express.js/4.21.0/Dockerfile b/Framework/express.js/4.21.0/Dockerfile
@@ -1,5 +1,5 @@
-FROM ghcr.io/labring-actions/devbox/node.js-20:1323f9
-USER root
+FROM ghcr.io/labring-actions/devbox/node.js-18:a49ab6
+
 RUN cd /home/devbox/project && \
 rm -rf ./*
 
@@ -12,5 +12,4 @@ USER devbox
 RUN cd /home/devbox/project && \
 npm install
  
-USER root
 RUN mkdir -p /home/devbox/.devbox
diff --git a/Framework/express.js/update_cn_dockerfile.sh b/Framework/express.js/update_cn_dockerfile.sh
@@ -5,8 +5,14 @@ echo "DOCKERFILE: $DOCKERFILE"
 TMP_DOCKERFILE="${DOCKERFILE}tmp"
 cp "$DOCKERFILE" "$TMP_DOCKERFILE"
 
+sed -i '$i\
+USER root' "$TMP_DOCKERFILE"
+
 sed -i '$i\
 COPY /OS/debian-ssh/debian.sources /etc/apt/sources.list.d/debian.sources' "$TMP_DOCKERFILE"
 
 sed -i '$i\
-RUN npm config set -g registry https://registry.npmmirror.com' "$TMP_DOCKERFILE"
+USER devbox' "$TMP_DOCKERFILE"
+
+sed -i '$i\
+RUN npm config set registry https://registry.npmmirror.com' "$TMP_DOCKERFILE"
diff --git a/Framework/hexo/7.3.0/Dockerfile b/Framework/hexo/7.3.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/labring-actions/devbox/node.js-20:1323f9
+FROM ghcr.io/labring-actions/devbox/node.js-18:a49ab6
 
 USER root
 RUN rm -r /home/devbox/project && \
@@ -16,5 +16,6 @@ COPY /Framework/hexo/7.3.0/entrypoint.sh /home/devbox/project/entrypoint.sh
 USER root
 RUN chown -R devbox:devbox /home/devbox/project/entrypoint.sh && \
 chmod -R 777 /home/devbox/project/entrypoint.sh
+USER devbox
  
 RUN mkdir -p /home/devbox/.devbox
diff --git a/Framework/hexo/update_cn_dockerfile.sh b/Framework/hexo/update_cn_dockerfile.sh
@@ -5,8 +5,14 @@ echo "DOCKERFILE: $DOCKERFILE"
 TMP_DOCKERFILE="${DOCKERFILE}tmp"
 cp "$DOCKERFILE" "$TMP_DOCKERFILE"
 
+sed -i '$i\
+USER root' "$TMP_DOCKERFILE"
+
 sed -i '$i\
 COPY /OS/debian-ssh/debian.sources /etc/apt/sources.list.d/debian.sources' "$TMP_DOCKERFILE"
 
 sed -i '$i\
-RUN npm config set -g registry https://registry.npmmirror.com' "$TMP_DOCKERFILE"
+USER devbox' "$TMP_DOCKERFILE"
+
+sed -i '$i\
+RUN npm config set registry https://registry.npmmirror.com' "$TMP_DOCKERFILE"
diff --git a/Framework/next.js/14.2.5/Dockerfile b/Framework/next.js/14.2.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/labring-actions/devbox/node.js-20:1323f9
+FROM  ghcr.io/labring-actions/devbox/node.js-18:a49ab6
 USER root
 RUN cd /home/devbox/project && \
 rm -rf ./*
@@ -14,5 +14,4 @@ npm config set fetch-retry-maxtimeout 10000000 && \
 pnpm install && \
 pnpm run build
 
-USER root
 RUN mkdir -p /home/devbox/.devbox
diff --git a/Framework/next.js/update_cn_dockerfile.sh b/Framework/next.js/update_cn_dockerfile.sh
@@ -1,12 +1,18 @@
-#!/bin/bash
+USER root#!/bin/bash
 
 DOCKERFILE=$1
 echo "DOCKERFILE: $DOCKERFILE"
 TMP_DOCKERFILE="${DOCKERFILE}tmp"
 cp "$DOCKERFILE" "$TMP_DOCKERFILE"
 
+sed -i '$i\
+USER root' "$TMP_DOCKERFILE"
+
 sed -i '$i\
 COPY /OS/debian-ssh/debian.sources /etc/apt/sources.list.d/debian.sources' "$TMP_DOCKERFILE"
 
 sed -i '$i\
-RUN npm config set -g registry https://registry.npmmirror.com' "$TMP_DOCKERFILE"
+USER devbox' "$TMP_DOCKERFILE"
+
+sed -i '$i\
+RUN npm config set registry https://registry.npmmirror.com' "$TMP_DOCKERFILE"
diff --git a/Framework/nginx/1.22.1/Dockerfile b/Framework/nginx/1.22.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/labring-actions/devbox/node.js-20:1323f9
+FROM ghcr.io/labring-actions/devbox/node.js-18:a49ab6
 USER root
 RUN cd /home/devbox/project
 
@@ -9,5 +9,5 @@ RUN chown -R devbox:devbox /home/devbox/project && \
 chmod -R u+rw /home/devbox/project && \
 chmod -R +x /home/devbox/project/entrypoint.sh
 
-USER root
+
 RUN mkdir -p /home/devbox/.devbox
diff --git a/Framework/nginx/update_cn_dockerfile.sh b/Framework/nginx/update_cn_dockerfile.sh
@@ -5,8 +5,14 @@ echo "DOCKERFILE: $DOCKERFILE"
 TMP_DOCKERFILE="${DOCKERFILE}tmp"
 cp "$DOCKERFILE" "$TMP_DOCKERFILE"
 
+sed -i '$i\
+USER root' "$TMP_DOCKERFILE"
+
 sed -i '$i\
 COPY /OS/debian-ssh/debian.sources /etc/apt/sources.list.d/debian.sources' "$TMP_DOCKERFILE"
 
 sed -i '$i\
-RUN npm config set -g registry https://registry.npmmirror.com' "$TMP_DOCKERFILE"
+USER devbox' "$TMP_DOCKERFILE"
+
+sed -i '$i\
+RUN npm config set registry https://registry.npmmirror.com' "$TMP_DOCKERFILE"
