archivist/apps/files/models.py

@@ -23,11 +23,9 @@ 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:
@@ -43,11 +41,9 @@ 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:
@@ -63,11 +59,9 @@ 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:
@@ -83,11 +77,9 @@ 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

@@ -1,16 +1,16 @@
 version: "3.8"
-
+   
 services:
     django:
-        build:
+        build: 
             context: .
             dockerfile: Dockerfile
             args:
               - USER_ID=1000
-        image: git.aroy-art.com/aroy/gallery-archivist:dev
+        image: gallery-archivist:dev
         #container_name: django
-        command: >
-                sh -c "cd archivist
+        command: > 
+                sh -c "cd archivist 
                 && python manage.py runserver 0.0.0.0:8000"
         volumes:
             - .:/app/
@@ -27,10 +27,10 @@ services:
 
     celery-worker:
         #build: .
-        image: git.aroy-art.com/aroy/gallery-archivist:dev
+        image: gallery-archivist:dev
         #container_name: celery_worker
-        command: >
-                sh -c "cd archivist
+        command: > 
+                sh -c "cd archivist 
                 && celery -A core worker -l INFO"
         volumes:
             - .:/app/
@@ -44,9 +44,9 @@ services:
 
     celery-beat:
         #build: .
-        image: git.aroy-art.com/aroy/gallery-archivist:dev
-        command: >
-                sh -c "cd archivist
+        image: gallery-archivist:dev
+        command: > 
+                sh -c "cd archivist 
                 && celery -A core beat -l INFO"
         volumes:
             - .:/app/