汉化修改

Author: Firfr

.dockerignore

@@ -15,7 +15,5 @@
 !server/**
 !tailwind.config.js
 !vite.config.js
-
-图片/
-
-node_modules/
+!sources.list
+!编辑器汉化.sh

.gitignore

@@ -248,3 +248,5 @@ dist
 .vscode/
 data/
 /notes/
+
+client/dist/

.htmlnanorc

@@ -0,0 +1,3 @@
+{
+  "minifySvg": false
+}

Dockerfile

@@ -1,7 +1,7 @@
 ARG BUILD_DIR=/build
 
-# Build Container
-FROM --platform=$BUILDPLATFORM node:20-alpine AS build
+# 编译前端
+FROM --platform=$BUILDPLATFORM node:20.19.0-alpine3.21 AS build
 
 ARG BUILD_DIR
 
@@ -14,14 +14,15 @@ COPY .htmlnanorc \
     postcss.config.js \
     tailwind.config.js \
     vite.config.js \
+    编辑器汉化.sh \
     ./
 
 RUN npm ci
 
 COPY client ./client
-RUN npm run build
+RUN npm run build && sh 编辑器汉化.sh
 
-# Runtime Container
+# 运行后端
 FROM python:3.11-slim-bullseye
 
 ARG BUILD_DIR
@@ -38,12 +39,16 @@ ENV FLATNOTES_PATH=/data
 RUN mkdir -p ${APP_PATH}
 RUN mkdir -p ${FLATNOTES_PATH}
 
+## 复制系统源
+COPY sources.list /etc/apt/
 RUN apt update && apt install -y \
     curl \
     gosu \
     && rm -rf /var/lib/apt/lists/*
 
-RUN pip install --no-cache-dir pipenv
+
+RUN pip config set global.index-url https://mirrors.aliyun.com/pypi/simple && \
+    pip install --no-cache-dir pipenv
 
 WORKDIR ${APP_PATH}
 
@@ -62,3 +67,5 @@ EXPOSE ${FLATNOTES_PORT}/tcp
 HEALTHCHECK --interval=60s --timeout=10s CMD /healthcheck.sh
 
 ENTRYPOINT [ "/entrypoint.sh" ]
+
+## docker build -t firfe/flatnotes_zh-cn:5.5.3 .

Dockerfile.experimental renamed to Dockerfile.experimental_原来

@@ -0,0 +1,64 @@
+ARG BUILD_DIR=/build
+
+# Build Container
+FROM --platform=$BUILDPLATFORM node:20-alpine AS build
+
+ARG BUILD_DIR
+
+RUN mkdir ${BUILD_DIR}
+WORKDIR ${BUILD_DIR}
+
+COPY .htmlnanorc \
+    package.json \
+    package-lock.json \
+    postcss.config.js \
+    tailwind.config.js \
+    vite.config.js \
+    ./
+
+RUN npm ci
+
+COPY client ./client
+RUN npm run build
+
+# Runtime Container
+FROM python:3.11-slim-bullseye
+
+ARG BUILD_DIR
+
+ENV PUID=1000
+ENV PGID=1000
+ENV EXEC_TOOL=gosu
+ENV FLATNOTES_HOST=0.0.0.0
+ENV FLATNOTES_PORT=8080
+
+ENV APP_PATH=/app
+ENV FLATNOTES_PATH=/data
+
+RUN mkdir -p ${APP_PATH}
+RUN mkdir -p ${FLATNOTES_PATH}
+
+RUN apt update && apt install -y \
+    curl \
+    gosu \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN pip install --no-cache-dir pipenv
+
+WORKDIR ${APP_PATH}
+
+COPY LICENSE Pipfile Pipfile.lock ./
+RUN pipenv install --deploy --ignore-pipfile --system && \
+    pipenv --clear
+
+COPY server ./server
+COPY --from=build --chmod=777 ${BUILD_DIR}/client/dist ./client/dist
+
+COPY entrypoint.sh healthcheck.sh /
+RUN chmod +x /entrypoint.sh /healthcheck.sh
+
+VOLUME /data
+EXPOSE ${FLATNOTES_PORT}/tcp
+HEALTHCHECK --interval=60s --timeout=10s CMD /healthcheck.sh
+
+ENTRYPOINT [ "/entrypoint.sh" ]

Dockerfile_原来

@@ -1,6 +1,6 @@
 [[source]]
-name = "pypi"
-url = "https://pypi.org/simple"
+name = "aliyun"
+url = "https://mirrors.aliyun.com/pypi/simple"
 verify_ssl = true
 
 [dev-packages]
@@ -18,9 +18,11 @@ python-jose = {extras = ["cryptography"], version = "==3.4.0"}
 pyotp = "==2.9.0"
 qrcode = "==8.0"
 python-multipart = "==0.0.20"
+jieba = "==0.42.1"
 
 [requires]
 python_version = "3.11"
 
 [pipenv]
 allow_prereleases = true
+