pin postgres, add prod volumes, fix relative symlink, bump to 2.0

diff --git a/docker-compose.yml b/docker-compose.yml
index ad03b4c3558c79ed912460a02ab8e634584b42b3..5b1fe771bafd99f64906380099cd30216dbbea59 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,7 +26,7 @@ services:
       - env/debug.env
 
   postgres:
-    image: postgres:11
+    image: postgres:13
     env_file:
       - env/debug.env
     environment:

diff --git a/env/prod.yml b/env/prod.yml
index 039fb32cb9017f457ae766471c8084002b44375d..1521e472e6859577261a5f8897efd58dd7877c5b 100644 (file)
--- a/env/prod.yml
+++ b/env/prod.yml
@@ -10,6 +10,9 @@ services:
     restart: unless-stopped
     env_file:
       - env/prod.env
+    volumes:
+      - /mnt/crfpa-videos:/mnt/crfpa-videos
+      - /mnt/crfpa-scripts:/mnt/crfpa-scripts
   
   channels:
     build:

diff --git a/setup.py b/setup.py
index 0f6443acccbae35bb48ecd68e81ec702f9e0138f..4a5cd9e0ba3d2d700c170dea27dc60cfa9871d66 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ setup(
   long_description = open('README.rst').read(),
   author = "Guillaume Pellerin",
   author_email = "yomguy@parisson.com",
-  version = '1.3',
+  version = '2.0',
   platforms=['OS Independent'],
   license='CeCILL v2',
   classifiers = CLASSIFIERS,

diff --git a/teleforma/exam/models.py b/teleforma/exam/models.py
index 5d9d5a2b9b023606cc17d1ef046131a54fd58e95..b4e3ad740a7877a70885f20cef46a62f03185976 100755 (executable)
--- a/teleforma/exam/models.py
+++ b/teleforma/exam/models.py
@@ -400,7 +400,7 @@ class Script(BaseResource):
         new_rel = os.sep.join(old_rel_root) + os.sep + str(self.uuid) + ext
 
         if not os.path.exists(new_abs):
-            os.symlink(old_abs, new_abs)
+            os.symlink(filename + ext, new_abs)
 
         if not self.url:
             self.url = settings.MEDIA_URL + str(new_rel)

diff --git a/teleforma/exam/templates/exam/script_detail.html b/teleforma/exam/templates/exam/script_detail.html
index 0281e1e027457c6e6371223d233cb17f1948854e..9ed42ac7da4536c2d8ede0bffc49cf270ccdf60d 100644 (file)
--- a/teleforma/exam/templates/exam/script_detail.html
+++ b/teleforma/exam/templates/exam/script_detail.html
@@ -50,6 +50,7 @@
     <a href="{% url 'teleforma-desk-period-course' period.id script.course.id %}">{{ script.title }}</a>
 
     <div style="float: right; font-size: 0.9em;">
+        <a href="{% url 'postman:write' script.author.username %}" class="component_icon button icon_ok">{% trans "Send a message" %}</a>
         {% if topic.file %}
         <a id="topic" href="{% url 'teleforma-document-download' topic.id %}" class="component_icon button icon_download">&nbsp;{% trans "Topic" %}</a>
         {% endif %}