Ver Fonte

:bug: fix mint release build python3 venv bug

China Kassapa há 7 meses atrás
pai
commit
c6ca52b439

+ 1 - 0
deploy/group_vars/all.yml

@@ -3,6 +3,7 @@ ansible_python_interpreter: /usr/bin/python3
 ansible_ssh_private_key_file: "{{ inventory_dir }}/.ssh/id_ed25519"
 
 app_deploy_target: "/srv/{{ app_domain }}/mint-{{ mint_version }}"
+app_build_target: "{{ ansible_env.HOME }}/build/{{ app_domain }}/mint-{{ mint_version }}"
 app_downloads: "{{ ansible_env.HOME }}/downloads"
 app_debug: false
 

+ 2 - 2
deploy/roles/mint-nginx/templates/nginx.conf.j2

@@ -15,7 +15,7 @@ server {
     gzip_types text/plain text/css application/xml application/javascript;
     gzip_vary on;
     client_max_body_size 512M;
-
+    
     access_log {{ app_deploy_target | dirname }}/logs/nginx/access.log;
     error_log {{ app_deploy_target | dirname }}/logs/nginx/error.log warn;
     # access_log syslog:server=unix:/dev/log,tag={{ app_domain }},nohostname,severity=info combined;
@@ -46,7 +46,7 @@ server {
         # for nginx v1.18
         # fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         include fastcgi_params;
-        fastcgi_hide_header X-Powered-By;
+        fastcgi_hide_header X-Powered-By;        
     }
  
     location ~ /\.(?!well-known).* {

+ 13 - 13
deploy/roles/mint-release-build/tasks/main.yml

@@ -1,45 +1,45 @@
-- name: Create {{ ansible_env.HOME }}/build
+- name: Create build folder
   ansible.builtin.file:
-    path: "{{ ansible_env.HOME }}/build"
+    path: "{{ app_build_target | dirname }}"
     state: directory
     mode: "0755"
 
 - name: Download source code
   ansible.builtin.unarchive:
     src: https://github.com/iapt-platform/mint/archive/{{ mint_version }}.zip
-    dest: "{{ ansible_env.HOME }}/build"
+    dest: "{{ app_build_target | dirname }}"
     remote_src: true
-    creates: "{{ ansible_env.HOME }}/build/mint-{{ mint_version }}"
+    creates: "{{ app_build_target }}"
 
 - name: Upload dashboard-v4 dist
   ansible.posix.synchronize:
     src: "{{ playbook_dir }}/tmp/mint/dashboard-v4/dashboard/dist-{{ app_domain }}-{{ mint_version }}/"
-    dest: "{{ ansible_env.HOME }}/build/mint-{{ mint_version }}/dashboard-v4/dashboard/dist/"
+    dest: "{{ app_build_target }}/dashboard-v4/dashboard/dist/"
 
 - name: Upload openai-proxy dist
   ansible.posix.synchronize:
     src: "{{ playbook_dir }}/tmp/mint/open-ai-server/dist/"
-    dest: "{{ ansible_env.HOME }}/build/mint-{{ mint_version }}/open-ai-server/dist/"
+    dest: "{{ app_build_target }}/open-ai-server/dist/"
 
 - name: Upload shell.sh
   ansible.builtin.template:
     src: shell.sh.j2
-    dest: "{{ ansible_env.HOME }}/build/mint-{{ mint_version }}/scripts/shell.sh"
+    dest: "{{ app_build_target }}/scripts/shell.sh"
     mode: "0555"
 
 - name: Upload build.sh
   ansible.builtin.template:
     src: build.sh.j2
-    dest: "{{ ansible_env.HOME }}/build/mint-{{ mint_version }}/scripts/build.sh"
+    dest: "{{ app_build_target }}/scripts/build.sh"
     mode: "0555"
 
-- name: "Setup mint dependencies and build mint-{{ mint_version }}.tar.xz"
+- name: Setup mint dependencies and build mint.tar.xz
   ansible.builtin.shell:
-    cmd: "docker run --rm -it --hostname=mint --network host -v {{ ansible_env.HOME }}/build/mint-{{ mint_version }}:{{ app_deploy_target }}:z {{ app_docker_image_name }} {{ app_deploy_target }}/scripts/build.sh"
-    creates: "{{ ansible_env.HOME }}/build/mint-{{ mint_version }}/tmp/{{ app_domain }}/mint-{{ mint_version }}.tar.xz"
+    cmd: "docker run --rm -it --hostname=mint --network host -v {{ app_build_target }}:{{ app_deploy_target }}:z {{ app_docker_image_name }} /bin/bash -c {{ app_deploy_target }}/scripts/build.sh"
+    creates: "{{ app_build_target }}/tmp/{{ app_domain }}/mint-{{ mint_version }}.tar.xz"
 
-- name: "Download mint-{{ mint_version }}.tar.xz"
+- name: Download mint.tar.xz
   ansible.posix.synchronize:
-    src: "{{ ansible_env.HOME }}/build/mint-{{ mint_version }}/tmp/{{ app_domain }}/mint-{{ mint_version }}.tar.xz"
+    src: "{{ app_build_target }}/tmp/{{ app_domain }}/mint-{{ mint_version }}.tar.xz"
     dest: "{{ playbook_dir }}/tmp/{{ app_domain }}-mint-{{ mint_version }}.tar.xz"
     mode: pull

+ 3 - 3
deploy/roles/mint-release-build/templates/build.sh.j2

@@ -48,11 +48,11 @@ php8.4 /usr/local/bin/composer install --no-ansi --quiet --optimize-autoloader -
 # npm run build
 
 cd {{ app_deploy_target }}/ai-translate/
-if [ ! -d python3 ]
+if [ -d python3 ]
 then
-    python3.13 -m venv $PWD/python3
-    sleep 1
+    rm -r python3
 fi
+python3.13 -m venv $PWD/python3
 source $PWD/python3/bin/activate
 if [ ! -f get-pip.py ]
 then

+ 8 - 2
deploy/roles/mint-v2.2/tasks/laravel.yml

@@ -19,15 +19,21 @@
 - name: Create logs folder
   become: true
   ansible.builtin.file:
-    path: "{{ app_deploy_target | dirname }}/logs/laravel"
+    path: "{{ app_deploy_target | dirname }}/logs/laravel-v8"
     state: directory
     owner: www-data
     mode: "0755"
 
+- name: Remove logs folder
+  become: true
+  ansible.builtin.file:
+    path: "{{ app_deploy_target }}/api-v8/storage/logs"
+    state: absent
+
 - name: Link logs folder
   become: true
   ansible.builtin.file:
-    src: "{{ app_deploy_target | dirname }}/logs/laravel"
+    src: "{{ app_deploy_target | dirname }}/logs/laravel-v8"
     dest: "{{ app_deploy_target }}/api-v8/storage/logs"
     state: link