From 46514d0897310e3d5121f2bc6f57149b6b2a8d4f Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Wed, 24 Aug 2022 10:29:29 +0300
Subject: [PATCH] add collect static command for rest/swagger ui

---
 .travis.yml                       | 4 ++--
 Dockerfile                        | 1 +
 README.md                         | 3 +++
 Vagrantfile                       | 2 ++
 webvirtcloud.sh                   | 9 +++++++--
 webvirtcloud/settings.py.template | 4 +---
 6 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c5fb27a..75adc51 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
 language: python
 python:
-  - "3.6"
+  - "3.9"
 env:
-  - DJANGO=3.2.4
+  - DJANGO=3.2.15
 install:
   - pip install -r dev/requirements.txt
 script:
diff --git a/Dockerfile b/Dockerfile
index fd89448..4b4d242 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,6 +41,7 @@ RUN python3 -m venv venv && \
 
 RUN . venv/bin/activate && \
     python3 manage.py migrate && \
+	python3 manage.py collectstatic --noinput && \
 	chown -R www-data:www-data /srv/webvirtcloud
 
 # Setup Nginx
diff --git a/README.md b/README.md
index e00b1ff..721a2d5 100644
--- a/README.md
+++ b/README.md
@@ -72,6 +72,7 @@ virtualenv -p python3 venv
 source venv/bin/activate
 pip install -r conf/requirements.txt
 python3 manage.py migrate
+python3 manage.py collectstatic --noinput
 sudo chown -R www-data:www-data /srv/webvirtcloud
 sudo rm /etc/nginx/sites-enabled/default
 ```
@@ -119,6 +120,7 @@ source venv/bin/activate
 pip3 install -r conf/requirements.txt
 cp conf/nginx/webvirtcloud.conf /etc/nginx/conf.d/
 python3 manage.py migrate
+python3 manage.py collectstatic --noinput
 ```
 
 #### Configure the supervisor for CentOS
@@ -357,6 +359,7 @@ source venv/bin/activate
 git pull
 pip3 install -U -r conf/requirements.txt 
 python3 manage.py migrate
+python3 manage.py collectstatic --noinput
 sudo service supervisor restart
 ```
 
diff --git a/Vagrantfile b/Vagrantfile
index d92377c..51522bb 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -42,7 +42,9 @@ Vagrant.configure(2) do |config|
      sudo cp /srv/webvirtcloud/conf/nginx/webvirtcloud.conf /etc/nginx/conf.d
      sudo cp /srv/webvirtcloud/webvirtcloud/settings.py.template /srv/webvirtcloud/webvirtcloud/settings.py
      sudo sed "s/SECRET_KEY = ''/SECRET_KEY = '"`python3 /srv/webvirtcloud/conf/runit/secret_generator.py`"'/" -i /srv/webvirtcloud/webvirtcloud/settings.py
+     python3 /srv/webvirtcloud/manage.py makemigrations
      python3 /srv/webvirtcloud/manage.py migrate
+     python3 /srv/webvirtcloud/manage.py collectstatic --noinput
      sudo rm /etc/nginx/sites-enabled/default
      sudo chown -R www-data:www-data /srv/webvirtcloud
      sudo service nginx restart
diff --git a/webvirtcloud.sh b/webvirtcloud.sh
index 9f97784..5b5248e 100755
--- a/webvirtcloud.sh
+++ b/webvirtcloud.sh
@@ -260,9 +260,14 @@ install_webvirtcloud () {
   
   echo "* Django Migrate."
   log "$PYTHON $APP_PATH/manage.py migrate"
-  $PYTHON $APP_PATH/manage.py migrate
   $PYTHON $APP_PATH/manage.py makemigrations
-
+  $PYTHON $APP_PATH/manage.py migrate
+  
+  
+  echo "* Django Collect Static"
+  log "$PYTHON $APP_PATH/manage.py collectstatic --noinput"
+  $PYTHON $APP_PATH/manage.py collectstatic --noinput
+  
   chown -R "$nginx_group":"$nginx_group" "$APP_PATH"
 }
 
diff --git a/webvirtcloud/settings.py.template b/webvirtcloud/settings.py.template
index 17156e1..d4cb9d8 100644
--- a/webvirtcloud/settings.py.template
+++ b/webvirtcloud/settings.py.template
@@ -132,9 +132,7 @@ USE_TZ = True
 
 STATIC_URL = "/static/"
 
-STATICFILES_DIRS = [
-    Path.joinpath(BASE_DIR, "static"),
-]
+STATIC_ROOT = Path.joinpath(BASE_DIR, "static")
 
 
 # Default primary key field type