Merge branch 'master' of https://gitee.com/bukun/TorCMS

Author: bukun

.gitignore

@@ -106,7 +106,7 @@ gh-pages
 tags
 
 # for Django
-# migrations/
+migrations/
 ????_initial.py
 !admin_torcms/migrations/__init__.py
 

docker/Debian/Dockerfile

@@ -19,7 +19,11 @@ RUN echo "deb http://mirrors.163.com/debian/ bullseye-backports main non-free co
 #########################################
 RUN mkdir ~/.pip
 RUN echo "[global]" > ~/.pip/pip.conf
+<<<<<<< HEAD
 RUN echo "index-url =  http://mirrors.aliyun.com/pypi/simple" >> ~/.pip/pip.conf
+=======
+RUN echo "index-url = http://mirrors.aliyun.com/pypi/simple" >> ~/.pip/pip.conf
+>>>>>>> 1afba395425ac7508be0075f826dba2e10cca879
 RUN echo "[install]" >> ~/.pip/pip.conf
 RUN echo "trusted-host=mirrors.aliyun.com" >> ~/.pip/pip.conf
 ##############################################################################
@@ -56,10 +60,18 @@ RUN source /vpy/bin/activate && pip3 install wheel
 RUN source /vpy/bin/activate && pip3 install email_validator
 RUN source /vpy/bin/activate && pip3 install -r doc/requirements.txt
 RUN source /vpy/bin/activate && pip3 install -r doc/requirements-dev.txt
+RUN source /vpy/bin/activate && pip3 install django
+
+RUN apt install -y sudo postgresql postgresql-contrib redis-server
+
+RUN /etc/init.d/postgresql start
+
+
 
 # 创建新用户
 RUN sudo -u postgres psql -c "CREATE ROLE torcms WITH LOGIN PASSWORD '123456';"
 
+
 # 创建新数据库并指定所有者
 RUN sudo -u postgres psql -c "CREATE DATABASE torcms WITH OWNER torcms;"
 

docker/Debian/builit.sh

@@ -1,3 +1,10 @@
 # docker stop $(docker ps -a -q)
 # docker rm $(docker ps -a -q)
-docker build -t bk-torcms-debian11 .
+
+
+podman build -t bk-torcms-debian11 .
+
+
+podman run -it bk-torcms-debian11 bash -c "/etc/init.d/postgresql start && sudo -u postgres psql -c \"CREATE ROLE torcms WITH LOGIN PASSWORD '111111';\" && sudo -u postgres psql -c \"CREATE DATABASE torcms WITH OWNER torcms;\" && /vpy/bin/python manage.py makemigrations && /vpy/bin/python manage.py migrate && /vpy/bin/python3 helper.py -i init " 
+
+# && /vpy/bin/python3 -m pytest torcms/tests/tester

docker/Debian/cfg_foo.py

@@ -37,8 +37,8 @@ def run_init(*args):
 
     # run_init_tables()
 
-    if Path(XLSX_FILE).exists():
-        run_gen_role_permission()
+    # if Path(XLSX_FILE).exists():
+    #     run_gen_role_permission()
 
     run_gen_category()
     run_create_admin()