Update: docker image & Fix: line endings

archivist/apps/files/models.py

@@ -23,9 +23,11 @@ def get_upload_to_banner(instance, filename):
 
 class User_Profile_Images(models.Model):
 
-    file_hash  = models.CharField(unique=True, max_length=64,)
+    file_hash  = models.CharField(unique=True, max_length=64)
     file_name  = models.CharField(max_length=150, blank=True)
     file       = models.FileField(upload_to=get_upload_to_profile, blank=True)
+    file_mime  = models.CharField(max_length=64, blank=True)
+    file_ext   = models.CharField(max_length=64, blank=True)
     date_added = models.DateTimeField(auto_now_add=True, editable=True)
 
     class Meta:
@@ -41,9 +43,11 @@ class User_Profile_Images(models.Model):
 
 class User_Banner_Images(models.Model):
 
-    file_hash  = models.CharField(unique=True, max_length=64,)
+    file_hash  = models.CharField(unique=True, max_length=64)
     file_name  = models.CharField(max_length=150, blank=True)
     file       = models.FileField(upload_to=get_upload_to_banner, blank=True)
+    file_mime  = models.CharField(max_length=64, blank=True)
+    file_ext   = models.CharField(max_length=64, blank=True)
     date_added = models.DateTimeField(auto_now_add=True, editable=True)
 
     class Meta:
@@ -59,9 +63,11 @@ class User_Banner_Images(models.Model):
 
 class Submission_File(models.Model):
 
-    file_hash  = models.CharField(unique=True, max_length=64,)
+    file_hash  = models.CharField(unique=True, max_length=64)
     file_name  = models.CharField(max_length=150, blank=True)
     file       = models.FileField(upload_to=get_upload_to_submission, blank=True)
+    file_mime  = models.CharField(max_length=64, blank=True)
+    file_ext   = models.CharField(max_length=64, blank=True)
     date_added = models.DateTimeField(auto_now_add=True, editable=True)
 
     class Meta:
@@ -77,9 +83,11 @@ class Submission_File(models.Model):
 
 class Metadata_Files(models.Model):
 
-    file_hash  = models.CharField(unique=True, max_length=64,)
+    file_hash  = models.CharField(unique=True, max_length=64)
     file_name  = models.CharField(max_length=150, blank=True)
     file       = models.FileField(upload_to=get_upload_to_metadata, blank=True)
+    file_mime  = models.CharField(max_length=64, blank=True)
+    file_ext   = models.CharField(max_length=64, blank=True)
     date_added = models.DateTimeField(auto_now_add=True, editable=True)
 
     class Meta:

docker-compose-dev.yml

@@ -7,7 +7,7 @@ services:
             dockerfile: Dockerfile
             args:
               - USER_ID=1000
-        image: gallery-archivist:dev
+        image: git.aroy-art.com/aroy/gallery-archivist:dev
         #container_name: django
         command: >
                 sh -c "cd archivist
@@ -27,7 +27,7 @@ services:
 
     celery-worker:
         #build: .
-        image: gallery-archivist:dev
+        image: git.aroy-art.com/aroy/gallery-archivist:dev
         #container_name: celery_worker
         command: >
                 sh -c "cd archivist
@@ -44,7 +44,7 @@ services:
 
     celery-beat:
         #build: .
-        image: gallery-archivist:dev
+        image: git.aroy-art.com/aroy/gallery-archivist:dev
         command: >
                 sh -c "cd archivist
                 && celery -A core beat -l INFO"