Merge pull request #272 from CybercentreCanada/integration/harbor_dev

add registry_type to DockerConfig* (dev)

Author: cccs-rs

assemblyline/odm/models/service.py

@@ -22,6 +22,7 @@ class DockerConfig(odm.Model):
     image: str = odm.Keyword()                       # Complete name of the Docker image with tag, may include registry
     registry_username = odm.Optional(odm.Keyword())  # The username to use when pulling the image
     registry_password = odm.Optional(odm.Keyword())  # The password or token to use when pulling the image
+    registry_type = odm.Enum(values=["docker", "harbor"], default='docker')  # The type of registry (Docker, Harbor)
     ports: List[str] = odm.List(odm.Keyword(), default=[])
     ram_mb: int = odm.Integer(default=512)
     ram_mb_min: int = odm.Integer(default=128)

assemblyline/odm/models/service_delta.py

@@ -16,6 +16,7 @@ class DockerConfigDelta(odm.Model):
     image = odm.Optional(odm.Keyword())  # The docker image and tag, optionally including registry in the normal way
     registry_username = odm.Optional(odm.Keyword())  # The username to use when pulling the image
     registry_password = odm.Optional(odm.Keyword())  # The password or token to use when pulling the image
+    registry_type = odm.Enum(values=["docker", "harbor"], default='docker')  # The type of registry (Docker, Harbor)
     ports = odm.Optional(odm.List(odm.Keyword()))
     ram_mb = odm.Optional(odm.Integer())
     ram_mb_min = odm.Optional(odm.Integer())