feat: Optimizing docker build

Dockerfile.daemon

@@ -1,23 +1,14 @@
-FROM node:lts-alpine AS builder
-
-ARG LATEST_TAG
-
-RUN apk update && \
-    apk add --no-cache --virtual .build-deps curl && \
-    cd /opt && \
-    curl -L -o mcsmanager_linux_release.tar.gz https://github.com/MCSManager/MCSManager/releases/download/$LATEST_TAG/mcsmanager_linux_release.tar.gz && \
-    tar -zxf mcsmanager_linux_release.tar.gz && \
-    rm -rf mcsmanager_linux_release.tar.gz && \
-    apk del .build-deps && \
-    rm -rf /var/cache/apk/*
-
-
 FROM node:lts-alpine
 
+ARG LATEST_TAG
 WORKDIR /opt/mcsmanager/daemon
 
-COPY --from=builder /opt/mcsmanager/daemon ./
-
-RUN npm install --omit=dev
+RUN cd /tmp && \
+    wget -O /tmp/mcsmanager.tar.gz https://github.com/MCSManager/MCSManager/releases/download/$LATEST_TAG/mcsmanager_linux_release.tar.gz && \
+    tar -xf mcsmanager.tar.gz && \
+    mv /tmp/mcsmanager/daemon /opt/mcsmanager/daemon && \
+    cd /opt/mcsmanager/daemon && \
+    npm install --omit=dev && \
+    rm -rf /tmp/*
 
 ENTRYPOINT ["node", "--max-old-space-size=8192", "--enable-source-maps", "app.js"]

Dockerfile.daemon_debian

@@ -1,23 +1,14 @@
-FROM node:lts-alpine AS builder
-
-ARG LATEST_TAG
-
-RUN apk update && \
-    apk add --no-cache --virtual .build-deps curl && \
-    cd /opt && \
-    curl -L -o mcsmanager_linux_release.tar.gz https://github.com/MCSManager/MCSManager/releases/download/$LATEST_TAG/mcsmanager_linux_release.tar.gz && \
-    tar -zxf mcsmanager_linux_release.tar.gz && \
-    rm -rf mcsmanager_linux_release.tar.gz && \
-    apk del .build-deps && \
-    rm -rf /var/cache/apk/*
-
-
 FROM node:lts-bookworm
 
+ARG LATEST_TAG
 WORKDIR /opt/mcsmanager/daemon
 
-COPY --from=builder /opt/mcsmanager/daemon ./
-
-RUN npm install --omit=dev
+RUN cd /tmp && \
+    wget -O /tmp/mcsmanager.tar.gz https://github.com/MCSManager/MCSManager/releases/download/$LATEST_TAG/mcsmanager_linux_release.tar.gz && \
+    tar -xf mcsmanager.tar.gz && \
+    mv /tmp/mcsmanager/daemon /opt/mcsmanager/daemon && \
+    cd /opt/mcsmanager/daemon && \
+    npm install --omit=dev && \
+    rm -rf /tmp/*
 
 ENTRYPOINT ["node", "--max-old-space-size=8192", "--enable-source-maps", "app.js"]

Dockerfile.web

@@ -1,23 +1,14 @@
-FROM node:lts-alpine AS builder
-
-ARG LATEST_TAG
-
-RUN apk update && \
-    apk add --no-cache --virtual .build-deps curl && \
-    cd /opt && \
-    curl -L -o mcsmanager_linux_release.tar.gz https://github.com/MCSManager/MCSManager/releases/download/$LATEST_TAG/mcsmanager_linux_release.tar.gz && \
-    tar -zxf mcsmanager_linux_release.tar.gz && \
-    rm -rf mcsmanager_linux_release.tar.gz && \
-    apk del .build-deps && \
-    rm -rf /var/cache/apk/*
-
-
 FROM node:lts-alpine
 
+ARG LATEST_TAG
 WORKDIR /opt/mcsmanager/web
 
-COPY --from=builder /opt/mcsmanager/web ./
-
-RUN npm install --omit=dev
+RUN cd /tmp && \
+    wget -O /tmp/mcsmanager.tar.gz https://github.com/MCSManager/MCSManager/releases/download/$LATEST_TAG/mcsmanager_linux_release.tar.gz && \
+    tar -xf mcsmanager.tar.gz && \
+    mv /tmp/mcsmanager/web /opt/mcsmanager/web && \
+    cd /opt/mcsmanager/web && \
+    npm install --omit=dev && \
+    rm -rf /tmp/*
 
 ENTRYPOINT ["node", "--max-old-space-size=8192", "--enable-source-maps", "app.js"]

README.md

@@ -7,6 +7,20 @@ https://hub.docker.com/r/1lkei/mcsmanager-web
 https://github.com/1lkei/mcsmanager-docker
 
 
+### mcsmanager
+#### 包含web和daemon
+```
+docker run -d \
+    --name mcsmanager \
+    -p 23333:23333 \
+    -p 24444:24444 \
+    -p 25565:25565 \
+    --restart unless-stopped \
+    -v $(pwd)/mcsmanager/daemon/data:/opt/mcsmanager/daemon/data \
+    -v /var/run/docker.sock:/var/run/docker.sock \
+    1lkei/mcsmanager:latest
+```
+
 ### web
 #### 第一次会自动添加本机daemon，需手动修改ip地址为本机ip，端口为映射端口即可
 ```
@@ -18,8 +32,8 @@ docker run -d \
     -v $(pwd)/mcsmanager/daemon/data:/opt/mcsmanager/daemon/data \
     1lkei/mcsmanager-web:latest
 ```
-### daemon
 
+### daemon
 ```
 docker run -d \
     --name mcsm-daemon \
@@ -31,6 +45,18 @@ docker run -d \
     1lkei/mcsmanager-daemon:latest
 ```
 
+### daemon debian版本
+```
+docker run -d \
+    --name mcsm-daemon \
+    -p 24444:24444 \
+    -p 25565:25565 \
+    --restart unless-stopped \
+    -v $(pwd)/mcsmanager/daemon/data:/opt/mcsmanager/daemon/data \
+    -v /var/run/docker.sock:/var/run/docker.sock:ro \
+    1lkei/mcsmanager-daemon:debian
+```
+
 
 ### 安装java 
 以下二选一:   

actions-time.txt

@@ -1 +1 @@
-2024.11.29
+2024.11.29v2