Added tar option

Added dev docker
Added docker-compose.dev.yml

Author: StarmanMartin

.env.sample

@@ -4,6 +4,8 @@ ELN_URL=https://XXXXXXXX
 DJANGO_SUPERUSER_USERNAME=Tom Riple
 DJANGO_SUPERUSER_EMAIL=taent.riple@kit.edu
 DJANGO_SUPERUSER_PASSWORD=QWer!1234
-DJANGO_POSTGRES_NAME=bridge
-DJANGO_POSTGRES_USER=postgres
-DJANGO_POSTGRES_PASSWORD=QWer!1234
+POSTGRES_NAME=bridge
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=QWer!1234
+PROJECT_POSTGRES_PORT=65432
+PROJECT_WEB_PORT=3222

ShuttleBuilder/settings.py

@@ -107,11 +107,11 @@
 if not DEBUG:
     DATABASES_AVAILABLE['default'] = {
         'ENGINE': 'django.db.backends.postgresql',
-        'NAME': os.environ.get('DJANGO_POSTGRES_NAME', 'bridge'),
-        'USER': os.environ.get('DJANGO_POSTGRES_USER', 'postgres'),
-        'PASSWORD': os.environ.get('DJANGO_POSTGRES_PASSWORD'),
-        'HOST': os.environ.get('DJANGO_POSTGRES_HOST', 'localhost'),
-        'PORT': os.environ.get('DJANGO_POSTGRES_PORT', '5432'),
+        'NAME': os.environ.get('POSTGRES_NAME', 'bridge'),
+        'USER': os.environ.get('POSTGRES_USER', 'postgres'),
+        'PASSWORD': os.environ.get('POSTGRES_PASSWORD'),
+        'HOST': os.environ.get('POSTGRES_HOST', 'localhost'),
+        'PORT': os.environ.get('POSTGRES_PORT', '5432'),
     }
 
 database = os.environ.get('DJANGO_DATABASE', 'default')

docker-compose.dev.yml

@@ -0,0 +1,33 @@
+version: '3'
+services:
+  db:
+    image: postgres:13
+    restart: unless-stopped
+    hostname: db
+    expose:
+      - 5432
+    ports:
+      - ${DJANGO_POSTGRES_PORT:-65432}:5432
+    environment:
+      - POSTGRES_USER=${POSTGRES_USER}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      - POSTGRES_DB=${POSTGRES_NAME}
+    env_file:
+      - ./.env
+    volumes:
+      - bridge_db:/var/lib/postgresql/data/
+  web:
+    build:
+      context: .
+    image: mstarman/shuttlebuilder:0.2.3
+    depends_on:
+      - db
+    environment:
+      - POSTGRES_PORT=5432
+      - POSTGRES_HOST=db
+    env_file:
+      - ./.env
+    ports:
+      - 3222:80
+volumes:
+  bridge_db:

docker-compose.yml

@@ -1,4 +1,20 @@
-version: '3'
+version: '3.7'
+
+x-postgress-variables: &postgress-variables
+  POSTGRES_NAME: "${POSTGRES_NAME:-postgres}"
+  POSTGRES_USER: "${POSTGRES_USER:-postgres}"
+  POSTGRES_PASSWORD: "${POSTGRES_PASSWORD:-q3opc3123§§!'urbn$5(#6}"
+
+x-envs: &envs
+  MODE: prod
+  ALLOWED_HOST: "${ALLOWED_HOST}"
+  ELN_URL: "${ELN_URL}"
+  DJANGO_SUPERUSER_USERNAME: "${DJANGO_SUPERUSER_USERNAME}"
+  DJANGO_SUPERUSER_EMAIL: "${DJANGO_SUPERUSER_EMAIL}"
+  DJANGO_SUPERUSER_PASSWORD: "${DJANGO_SUPERUSER_PASSWORD}"
+  POSTGRES_PORT: 5432
+  POSTGRES_HOST: db
+
 services:
   db:
     image: postgres:13
@@ -7,27 +23,19 @@ services:
     expose:
       - 5432
     ports:
-      - ${DJANGO_POSTGRES_PORT:-65432}:5432
+      - ${PROJECT_POSTGRES_PORT:-65432}:5432
     environment:
-      - POSTGRES_USER=${DJANGO_POSTGRES_USER}
-      - POSTGRES_PASSWORD=${DJANGO_POSTGRES_PASSWORD}
-      - POSTGRES_DB=${DJANGO_POSTGRES_NAME}
-    env_file:
-      - ./.env
+      <<: *postgress-variables
     volumes:
       - bridge_db:/var/lib/postgresql/data/
   web:
-    build:
-      context: .
-    image: mstarman/shuttlebuilder:0.2.1
+    image: mstarman/shuttlebuilder:0.2.3
+    restart: unless-stopped
     depends_on:
       - db
     environment:
-      - DJANGO_POSTGRES_PORT=5432
-      - DJANGO_POSTGRES_HOST=db
-    env_file:
-      - ./.env
+      <<: [*envs, *postgress-variables]
     ports:
-      - 3222:80
+      - ${PROJECT_WEB_PORT:-80}:80
 volumes:
   bridge_db:

main_app/models.py

@@ -102,7 +102,7 @@ def __str__(self):
         return self.name
 
     def get_path(self):
-        folder_name = re.sub(r'[^a-zA-Z0-9]', '_',self.name)
+        folder_name = re.sub(r'[^a-zA-Z0-9]', '_', self.name)
         file_paths = os.path.join('./projects/git_repos/', folder_name)
         new_repo = glob.glob(os.path.join(file_paths, '*'))
         if len(new_repo) > 0:
@@ -111,6 +111,7 @@ def get_path(self):
             new_repo = None
 
         return (file_paths, new_repo)
+
     @classmethod
     def get_active(self):
         try:
@@ -179,7 +180,8 @@ class ShuttleInstanceSearchForm(AbstractSearchForm):
 TYPE_CHOISES = (
     ('file', _('File')),
     ('folder', _('Folder')),
-    ('zip', _('ZIP'))
+    ('zip', _('ZIP')),
+    ('tar', _('TAR'))
 )
 
 SYSTEM_CHOISES = (
@@ -199,7 +201,8 @@ class ShuttleInstance(models.Model, SdcModel):
     html_list_template = "main_app/models/ShuttleInstance/ShuttleInstance_list.html"
     html_detail_template = "main_app/models/ShuttleInstance/ShuttleInstance_details.html"
 
-    name = models.CharField(help_text=_('Unique name of the Shuttle instance. This name cannot be changed!'), max_length=50,
+    name = models.CharField(help_text=_('Unique name of the Shuttle instance. This name cannot be changed!'),
+                            max_length=50,
                             unique=True)
     user = models.CharField(help_text=_("WebDAV or STFP User"), max_length=50, default="")
     password = models.CharField(help_text=_("WebDAV or STFP Password"), max_length=100)
@@ -219,7 +222,7 @@ class ShuttleInstance(models.Model, SdcModel):
                     <span style="margin-left: 30px;">[PROJECT_PATH]-Path (directory) within the LSDF</span>"""),
                            max_length=255)
     shuttle_type = models.CharField(_('Type'), help_text=_(
-        "Type must be 'file', 'folder' or 'zip'. The 'file' option means that each file is handled individually, the 'folder' option means that entire folders are transmitted only when all files in them are ready. The option 'zip' sends a folder zipped, only when all files in a folder are ready."),
+        "Type must be 'file', 'folder', 'tar' or 'zip'. The 'file' option means that each file is handled individually, the 'folder' option means that entire folders are transmitted only when all files in them are ready. The options 'tar' ond/or 'zip' sends a folder zipped (or compressed as tar archieve), only when all files in a folder are ready."),
                                     max_length=255, choices=TYPE_CHOISES)
     duration = models.IntegerField(
         help_text=_("Duration in seconds, i.e., how long a file must not be changed before sent. (default 300 sec.)"),
@@ -233,7 +236,6 @@ class ShuttleInstance(models.Model, SdcModel):
     last_build = models.DateTimeField(null=True, blank=True)
     owner = models.ForeignKey(User, on_delete=models.SET_NULL, null=True)
 
-
     def __str__(self):
         return self.name
 

main_app/templates/main_app/sdc/git_insatnce_edit.html

@@ -1,4 +1,4 @@
-<div class="container">
+<div class="container position-relative">
 <h2 class="page-header"><this.form_header></this.form_header></h2>
 
 <form >

main_app/templates/main_app/sdc/git_instance_list.html

@@ -1,4 +1,4 @@
-<div class="container">
+<div class="container position-relative">
     <h3 class="page-header">List of all liked GIT repos</h3>
     <div class="list-container">
     </div>