diff --git a/Applications/DockerApp/package/Classes/DockerApp.yaml b/Applications/DockerApp/package/Classes/DockerApp.yaml index c174738..72ef542 100644 --- a/Applications/DockerApp/package/Classes/DockerApp.yaml +++ b/Applications/DockerApp/package/Classes/DockerApp.yaml @@ -85,4 +85,5 @@ Methods: Continue: - $key: $pair[0].trim() - $result[$key]: $pair[1].trim() - - Return: $result \ No newline at end of file + - Return: $result + diff --git a/Applications/HTTPdServer/package/manifest.yaml b/Applications/HTTPdServer/package/manifest.yaml index 9298b2c..002fc55 100644 --- a/Applications/HTTPdServer/package/manifest.yaml +++ b/Applications/HTTPdServer/package/manifest.yaml @@ -14,8 +14,10 @@ Format: 1.3 Type: Application FullName: com.example.docker.DockerHTTPd Name: Docker HTTPd -Description: | - The Apache HTTP Server, colloquially called Apache, is a Web server application notable for playing a key role in the initial growth of the World Wide Web. +Description: >- + The Apache HTTP Server, colloquially called Apache, is a Web server + application notable for playing a key role in the initial growth + of the World Wide Web. Author: 'Mirantis, Inc' Tags: [docker, application, httpd] Classes: diff --git a/Applications/InfluxDB/package/manifest.yaml b/Applications/InfluxDB/package/manifest.yaml index f8dc232..f9206c7 100644 --- a/Applications/InfluxDB/package/manifest.yaml +++ b/Applications/InfluxDB/package/manifest.yaml @@ -15,7 +15,7 @@ Type: Application FullName: com.example.docker.DockerInfluxDB Name: Docker InfluxDB Description: | - InfluxDB is a time series, events, and metrics database. It’s written in Go and has no external dependencies. That means once you install it there’s nothing else to manage (like Redis, HBase, or whatever). + InfluxDB is a time series, events, and metrics database. It’s written in Go and has no external dependencies. That means once you install it there’s nothing else to manage (like Redis, HBase, or whatever). Author: 'Mirantis, Inc' Tags: [docker, application, InfluxDB] Classes: diff --git a/Applications/MariaDB/package/UI/ui.yaml b/Applications/MariaDB/package/UI/ui.yaml index cc15238..d31dfec 100644 --- a/Applications/MariaDB/package/UI/ui.yaml +++ b/Applications/MariaDB/package/UI/ui.yaml @@ -19,7 +19,6 @@ Application: host: $.appConfiguration.host publish: $.appConfiguration.publish password: $.appConfiguration.password - Forms: - appConfiguration: diff --git a/Applications/Nginx/package/manifest.yaml b/Applications/Nginx/package/manifest.yaml index 56b6466..60a63b4 100644 --- a/Applications/Nginx/package/manifest.yaml +++ b/Applications/Nginx/package/manifest.yaml @@ -14,8 +14,11 @@ Format: 1.3 Type: Application FullName: com.example.docker.DockerNginx Name: Docker Nginx -Description: | - Nginx (pronounced “engine-x”) is an open source reverse proxy server for HTTP, HTTPS, SMTP, POP3, and IMAP protocols, as well as a load balancer, HTTP cache, and a web server (origin server). +Description: >- + Nginx (pronounced "engine-x") is an open source reverse + proxy server for HTTP, HTTPS, SMTP, POP3, and IMAP + protocols, as well as a load balancer, HTTP cache, + and a web server (origin server). Author: 'Mirantis, Inc' Tags: [docker, application, Nginx] Classes: diff --git a/Applications/Tomcat/package/manifest.yaml b/Applications/Tomcat/package/manifest.yaml index 2c6effd..1e340b0 100644 --- a/Applications/Tomcat/package/manifest.yaml +++ b/Applications/Tomcat/package/manifest.yaml @@ -14,8 +14,12 @@ Format: 1.3 Type: Application FullName: com.example.docker.DockerTomcat Name: Docker Tomcat -Description: | - Apache Tomcat (or simply Tomcat) is an open source web server and servlet container developed by the Apache Software Foundation (ASF). Tomcat implements the Java Servlet and the JavaServer Pages (JSP) specifications from Oracle, and provides a “pure Java” HTTP web server environment for Java code to run in. +Description: >- + Apache Tomcat (or simply Tomcat) is an open source web server and servlet + container developed by the Apache Software Foundation (ASF). + Tomcat implements the Java Servlet and the JavaServer Pages (JSP) + specifications from Oracle, and provides a "pure Java" HTTP web server + environment for Java code to run in. Author: 'Mirantis, Inc' Tags: [docker, application, Tomcat] Classes: @@ -24,3 +28,4 @@ Require: com.mirantis.docker.DockerStandaloneHost: com.mirantis.docker.kubernetes.KubernetesPod: com.mirantis.docker.Interfaces: + diff --git a/DockerInterfacesLibrary/package/Classes/DockerHelpers.yaml b/DockerInterfacesLibrary/package/Classes/DockerHelpers.yaml index c864959..eb68d6e 100644 --- a/DockerInterfacesLibrary/package/Classes/DockerHelpers.yaml +++ b/DockerInterfacesLibrary/package/Classes/DockerHelpers.yaml @@ -18,7 +18,7 @@ Name: DockerHelpers Methods: labels2Map: Arguments: - labelsString: + labelsString: Contract: $.string().notNull() Body: - $result: {} @@ -35,8 +35,8 @@ Methods: map2labels: Arguments: - labelsMap: - Contract: + labelsMap: + Contract: $.string().notNull(): $.string().notNull() Body: - Return: $labelsMap.select(list($, $labelsMap.get($)).join('=')).join(';') diff --git a/DockerInterfacesLibrary/package/Classes/DockerVolume.yaml b/DockerInterfacesLibrary/package/Classes/DockerVolume.yaml index bf1c053..ea71663 100644 --- a/DockerInterfacesLibrary/package/Classes/DockerVolume.yaml +++ b/DockerInterfacesLibrary/package/Classes/DockerVolume.yaml @@ -21,7 +21,7 @@ Properties: Methods: getType: - + getParameters: getRepresentation: @@ -29,3 +29,4 @@ Methods: Return: type: $.getType() parameters: $.getParameters() + diff --git a/DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml b/DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml index 0e97ab3..4bf40dd 100644 --- a/DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml +++ b/DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml @@ -18,10 +18,10 @@ Namespaces: Name: DockerStandaloneHost -Extends: +Extends: - DockerContainerHost -Properties: +Properties: name: Contract: $.string().notNull() @@ -59,8 +59,7 @@ Properties: Methods: .init: Body: - - $._environment: $.find(std:Environment).require() - + - $._environment: $.find(std:Environment).require() deploy: Body: diff --git a/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Pod.yaml b/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Pod.yaml index fba931c..4a09cbe 100644 --- a/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Pod.yaml +++ b/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Pod.yaml @@ -38,7 +38,6 @@ Methods: - $.deployPod() - $.setAttr(deployed, true) - deployPod: Body: - $resources: new(sys:Resources) diff --git a/Kubernetes/KubernetesEntitiesLibrary/package/Classes/ReplicationController.yaml b/Kubernetes/KubernetesEntitiesLibrary/package/Classes/ReplicationController.yaml index 96aa1a3..bda2d29 100644 --- a/Kubernetes/KubernetesEntitiesLibrary/package/Classes/ReplicationController.yaml +++ b/Kubernetes/KubernetesEntitiesLibrary/package/Classes/ReplicationController.yaml @@ -38,11 +38,9 @@ Methods: - $.deployReplicationController() - $.setAttr(deployed, true) - deployReplicationController: Body: - $resources: new(sys:Resources) - - $template: $resources.yaml('UpdateReplicationController.template').bind(dict( controllerDefinition => $.replicationControllerDefinition, isNew => true diff --git a/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Service.yaml b/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Service.yaml index 9187360..7692e7c 100644 --- a/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Service.yaml +++ b/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Service.yaml @@ -38,11 +38,9 @@ Methods: - $.deployService() - $.setAttr(deployed, true) - deployService: Body: - $resources: new(sys:Resources) - - $template: $resources.yaml('UpdateService.template').bind(dict( serviceDefinition => $.serviceDefinition, isNew => true