perf: 优化容器

Author: nineaiyu

.github/workflows/issue-close.yml

@@ -2,7 +2,7 @@ name: Issue Close Check
 
 on:
   issues:
-    types: [closed]
+    types: [ closed ]
 
 jobs:
   issue-close-remove-labels:

.github/workflows/issue-comment.yml

@@ -1,6 +1,6 @@
 on:
   issue_comment:
-    types: [created]
+    types: [ created ]
 
 name: Add issues workflow labels
 

.github/workflows/issue-open.yml

@@ -2,7 +2,7 @@ name: Issue Open Check
 
 on:
   issues:
-    types: [opened]
+    types: [ opened ]
 
 jobs:
   issue-open-add-labels:

.gitignore

@@ -7,3 +7,4 @@ static/*
 upload/*
 common/utils/ip/geoip/GeoLite2-City.mmdb
 common/utils/ip/ipip/ipipfree.ipdb
+config.yml

Dockerfile

@@ -11,9 +11,6 @@ RUN echo > config.yml \
         sed -i "s@VERSION = .*@VERSION = '${VERSION}'@g" server/const.py; \
     fi
 
-RUN set -ex \
-    && export SECRET_KEY=$(head -c100 < /dev/urandom | base64 | tr -dc A-Za-z0-9 | head -c 48)
-
 FROM python:3.12.7-slim
 
 ENV LANG=en_US.UTF-8 \

common/management/commands/services/hands.py

@@ -34,7 +34,7 @@
 DEBUG = CONFIG.DEBUG or False
 APPS_DIR = settings.BASE_DIR
 LOG_DIR = os.path.join(APPS_DIR, 'data', 'logs')
-TMP_DIR = os.path.join(APPS_DIR, 'data', 'tmp')
+TMP_DIR = os.path.join(APPS_DIR, 'tmp')
 
 
 def check_port_is_used():

entrypoint.sh

@@ -13,7 +13,7 @@ service="${2-all}"
 
 trap cleanup EXIT
 
-rm -f logs/tmp/*.pid
+rm -f /data/xadmin-server/tmp/*.pid
 
 if [[ "${action:0:1}" == "/" ]];then
     "$@"

server/const.py

@@ -8,7 +8,7 @@
 
 PROJECT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 LOG_DIR = os.path.join(PROJECT_DIR, "data", "logs")
-TMP_DIR = os.path.join(PROJECT_DIR, "data", "tmp")
+TMP_DIR = os.path.join(PROJECT_DIR, "tmp")
 CELERY_LOG_DIR = os.path.join(LOG_DIR, "task")
-VERSION = '5.0.0'
+VERSION = '4.2.0'
 CONFIG = ConfigManager.load_user_config()

data/tmp/.gitkeep renamed to tmp/.gitkeep

@@ -50,12 +50,15 @@ function check_docker_start() {
 function check_permission() {
     project_parent_dir=$(dirname "${PROJECT_DIR}")
     mkdir -p "${project_parent_dir}"/xadmin-mariadb/{data,logs}
-    if [ "$(stat -c  %u logs)" -ne "1001" ] ;then
+    if [ "$(stat -c  %u data/logs)" -ne "1001" ] ;then
       chown 1001.1001 -R "${project_parent_dir}"/xadmin-mariadb/{data,logs}
       chown 1001.1001 -R "${project_parent_dir}"/xadmin-server/*
     fi
 }
 
+function pull_images() {
+    bash "${PROJECT_DIR}/utils/pull_docker_images.sh"
+}
 
 EXE=""
 
@@ -91,10 +94,6 @@ function restart() {
   start
 }
 
-function pull_images() {
-    bash "${PROJECT_DIR}/utils/pull_docker_images.sh"
-}
-
 function import_tzinfo() {
   if ${EXE} ps|grep xadmin-mariadb|grep healthy &>/dev/null;then
     docker exec -it xadmin-mariadb sh -c 'mariadb-tzinfo-to-sql /usr/share/zoneinfo | mariadb -u root mysql && echo "import tzinfo success"'