Merge pull request #171 from SelfhostedPro/updating

added network_mode to templates and db
SelfhostedPro · Oct 15, 2020 · 5842033 · 5842033
2 parents abca524 + 91176ef
commit 5842033
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/backend/api/db/crud/templates.py b/backend/api/db/crud/templates.py
@@ -73,6 +73,7 @@ def add_template(db: Session, template: models.containers.Template):
                         categories=entry.get('categories', ''),
                         restart_policy=entry.get('restart_policy'),
                         ports=ports,
+                        network_mode=entry.get('network_mode', ''),
                         volumes=entry.get('volumes', []),
                         env=entry.get('env', []),
                         devices=entry.get('devices', []),
@@ -99,6 +100,7 @@ def add_template(db: Session, template: models.containers.Template):
                     categories=entry.get('categories', ''),
                     restart_policy=entry.get('restart_policy'),
                     ports=ports,
+                    network_mode=entry.get('network_mode', ''),
                     volumes=entry.get('volumes', []),
                     env=entry.get('env', []),
                     devices=entry.get('devices', []),
@@ -160,6 +162,7 @@ def refresh_template(db: Session, template_id: id):
                         categories=entry.get('categories', ''),
                         restart_policy=entry.get('restart_policy'),
                         ports=ports,
+                        network_mode=entry.get('network_mode', ''),
                         volumes=entry.get('volumes', []),
                         env=entry.get('env', []),
                         devices=entry.get('devices', []),
@@ -186,6 +189,7 @@ def refresh_template(db: Session, template_id: id):
                     categories=entry.get('categories', ''),
                     restart_policy=entry.get('restart_policy'),
                     ports=ports,
+                    network_mode=entry.get('network_mode', ''),
                     volumes=entry.get('volumes', []),
                     env=entry.get('env', []),
                     devices=entry.get('devices', []),

diff --git a/backend/api/db/models/containers.py b/backend/api/db/models/containers.py
@@ -54,6 +54,8 @@ class TemplateItem(Base):
                             nullable=True, unique=False, index=False)
     ports = Column(JSON,
                    nullable=True, unique=False, index=False)
+    network_mode = Column(JSON,
+                     nullable=True, unique=False, index=False)
     volumes = Column(JSON,
                      nullable=True, unique=False, index=False)
     env = Column(JSON,

diff --git a/backend/api/db/schemas/templates.py b/backend/api/db/schemas/templates.py
@@ -23,6 +23,7 @@ class TemplateItem(BaseModel):
     labels: Optional[List] = []
     sysctls: Optional[List] = []
     cap_add: Optional[List] = []
+    network_mode: Optional[str]
 
     class Config:
         orm_mode = True

diff --git a/backend/api/settings.py b/backend/api/settings.py
@@ -29,6 +29,8 @@ class Settings(BaseSettings):
         {"variable": "!pictures", "replacement": "/yacht/Media/Photos"},
         {"variable": "!localtime", "replacement": "/etc/localtime"},
         {"variable": "!logs", "replacement": "/yacht/AppData/Logs"},
+        {"variable": "!PUID", "replacement": "1000"},
+        {"variable": "!GUID", "replacement": "100"},
     ]
     SQLALCHEMY_DATABASE_URI = os.environ.get(
         "DATABASE_URL", "sqlite:///config/data.sqlite"