Merge pull request s045pd#2 from MSKNET/patch

Optimize the docker image

Author: s045pd

Dockerfile

@@ -1,27 +1,25 @@
-FROM node:12.16.2-stretch
-
-
-COPY sources.list /etc/apt/sources.list
-RUN apt update && apt install ffmpeg -y
-
+FROM node:12-slim AS gui-builder
+COPY gui/package.json gui/package-lock.json /work/gui/
+RUN cd /work/gui && npm ci && npm cache clean --force
+COPY gui /work/gui
+RUN cd /work/gui && npm run build && npm cache clean --force
+
+
+FROM node:12-slim AS production
+RUN sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list && \
+	sed -i 's/security.debian.org/archive.debian.org/g' /etc/apt/sources.list && \
+	sed -i '/stretch-updates/d' /etc/apt/sources.list && \
+	apt-get update && \
+	apt-get install -y --no-install-recommends ffmpeg && \
+	apt-get clean && \
+	rm -rf /var/lib/apt/lists/*
 
 WORKDIR /work/
-COPY anyproxy/ ./anyproxy/
 COPY package.json package-lock.json .
-RUN npm install
-
+RUN npm ci && npm cache clean --force
 
-COPY gui/ ./gui/
-WORKDIR /work/gui
-RUN npm install && npm run build 
+COPY anyproxy/ ./anyproxy/
+COPY --from=gui-builder /work/gui/dist /work/gui/dist
 
-WORKDIR /work/
 COPY utils.js api-server.js server.js database.js docker-entrypoint.sh .
-RUN /work/anyproxy/bin/anyproxy-ca --generate \
-	&& mkdir /work/ssl/ \
-	&& cp /root/.anyproxy/certificates/rootCA.* /work/ssl/ 
-RUN apt-get clean && npm cache clean -f
-
-
-
-ENTRYPOINT ["/work/docker-entrypoint.sh"]
+ENTRYPOINT ["/work/docker-entrypoint.sh"]

Dockerfile_CN

@@ -1,27 +1,24 @@
-FROM node:12.16.2-stretch
+ARG NPM_REGISTRY=https://registry.npm.taobao.org
+FROM node:12-slim AS gui-builder
+COPY gui/package.json gui/package-lock.json /work/gui/
+RUN cd /work/gui && npm config set registry ${NPM_REGISTRY} && npm ci && npm cache clean --force
+COPY gui /work/gui
+RUN cd /work/gui && npm run build && npm cache clean --force
 
 
+FROM node:12-slim AS production
 COPY sources.list /etc/apt/sources.list
-RUN apt update && apt install ffmpeg -y
-
+RUN apt-get update && \
+	apt-get install -y --no-install-recommends ffmpeg && \
+	apt-get clean && \
+	rm -rf /var/lib/apt/lists/*
 
 WORKDIR /work/
-COPY anyproxy/ ./anyproxy/
 COPY package.json package-lock.json .
-RUN npm config set registry https://registry.npm.taobao.org && npm install
+RUN npm config set registry ${NPM_REGISTRY} && npm ci && npm cache clean --force
 
+COPY anyproxy/ ./anyproxy/
+COPY --from=gui-builder /work/gui/dist /work/gui/dist
 
-COPY gui/ ./gui/
-WORKDIR /work/gui
-RUN npm install && npm run build 
-
-WORKDIR /work/
 COPY utils.js api-server.js server.js database.js docker-entrypoint.sh .
-RUN /work/anyproxy/bin/anyproxy-ca --generate \
-	&& mkdir /work/ssl/ \
-	&& cp /root/.anyproxy/certificates/rootCA.* /work/ssl/ 
-RUN apt-get clean && npm cache clean -f
-
-
-
-ENTRYPOINT ["/work/docker-entrypoint.sh"]
+ENTRYPOINT ["/work/docker-entrypoint.sh"]

api-server.js

@@ -627,7 +627,7 @@ async function get_api_server(proxy_utils) {
    * Serve up the CA cert for download
    */
   app.get(API_BASE_PATH + "/download_ca", async (req, res) => {
-    res.download(`${__dirname}/ssl/rootCA.crt`, "CursedChromeCA.crt");
+    res.download(`${__dirname}/cassl/rootCA.crt`, "CursedChromeCA.crt");
   });
 
   /*

database.js

@@ -297,7 +297,7 @@ function get_default_user_created_banner(username, password) {
   return `
 ============================================================================
 
- █████╗ ████████╗████████╗███████╗███╗   ██╗████████╗██╗ ████���█╗ ███╗   ██╗
+ █████╗ ████████╗████████╗███████╗███╗   ██╗████████╗██╗ ██████╗ ███╗   ██╗
 ██╔══██╗╚══██╔══╝╚══██╔══╝██╔════╝████╗  ██║╚══██╔══╝██║██╔═══██╗████╗  ██║
 ███████║   ██║      ██║   █████╗  ██╔██╗ ██║   ██║   ██║██║   ██║██╔██╗ ██║
 ██╔══██║   ██║      ██║   ██╔══╝  ██║╚██╗██║   ██║   ██║██║   ██║██║╚██╗██║

docker-entrypoint.sh

@@ -1,4 +1,20 @@
 #!/bin/bash
 sleep 3
-cp /work/ssl/* /work/cassl/
+
+if [ ! -d /work/cassl ]; then
+    echo "Error: The /work/cassl directory does not exist!"
+    echo "Please mount this directory before running the Docker container."
+    exit 1
+fi
+
+if [ ! -f /work/cassl/rootCA.crt ] || [ ! -f /work/cassl/rootCA.key ]; then
+    echo "The certificate and key files are missing in /work/cassl. Generating new CA..."
+    /work/anyproxy/bin/anyproxy-ca --generate
+    cp -a /root/.anyproxy/certificates/rootCA.* /work/cassl/
+else
+    echo "Using existing certificate and key files..."
+    mkdir -p /root/.anyproxy/certificates
+    cp -a /work/cassl/rootCA.* /root/.anyproxy/certificates/
+fi
+
 node /work/server.js