Commit dee5a857 authored by Stefano Alberto Russo's avatar Stefano Alberto Russo
Browse files

Minor fixes in model fields attributes and the populate script.

parent 444b121c

services/webapp/code/rosetta/core_app/management/commands/core_app_populate.py

+5 −5
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ class Command(BaseCommand): 
                                     supports_user_auth     = False,

                                     supports_pass_auth     = True)



            # BasicMetaDesktop Singularity (sarusso repo)

            # BasicMetaDesktop Docker (sarusso repo)

            Container.objects.create(user     = None,

                                     name     = 'BasicMetaDesktop latest',

                                     image    = 'sarusso/basicmetadesktop',
@@ -70,11 +70,11 @@ class Command(BaseCommand): 
                                     supports_pass_auth     = True)





            # DevMetaDesktop Singularity (sarusso repo)

            # DevMetaDesktop Docker (sarusso repo)

            Container.objects.create(user     = None,

                                     name     = 'DevMetaDesktop latest',

                                     image    = 'sarusso/devmetadesktop',

                                     type     = 'singularity',

                                     type     = 'docker',

                                     registry = 'docker_hub',

                                     ports    = '8590',

                                     supports_dynamic_ports = True,
@@ -150,7 +150,7 @@ class Command(BaseCommand): 
        else:

            print('Creating testuser private containers...')



            # JuPyter Singularity

            # Jupyter Singularity

            Container.objects.create(user     = testuser,

                                     name     = 'Jupyter Notebook latest',

                                     image    = 'jupyter/base-notebook',
@@ -161,7 +161,7 @@ class Command(BaseCommand): 
                                     supports_user_auth     = False,

                                     supports_pass_auth     = False)

            

            # JuPyter Docker

            # Jupyter Docker

            Container.objects.create(user     = testuser,

                                     name     = 'Jupyter Notebook latest',

                                     image    = 'jupyter/base-notebook',

services/webapp/code/rosetta/core_app/models.py

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ class LoginToken(models.Model): 
class Container(models.Model):



    uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)

    user = models.ForeignKey(User, related_name='+', on_delete=models.CASCADE, null=True)  

    user = models.ForeignKey(User, related_name='+', on_delete=models.CASCADE, blank=True, null=True)  

    # If a container has no user, it will be available to anyone. Can be created, edited and deleted only by admins.



    name     = models.CharField('Container Name', max_length=255, blank=False, null=False)