brammp/gittemp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

feat(templates): merge branch 'integration' into 'add-categories-platform'

Browse Source
This commit is contained in:
Anthony Lapenna
2017-05-18 21:44:27 +02:00
parent a2acc441a3
commit ef203fd4c0
1 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
templates.json
View File

@@ -159,7 +159,6 @@
"volumes": ["/usr/share/elasticsearch/data"] "volumes": ["/usr/share/elasticsearch/data"]
}, },
{ {
<<<<<<< HEAD
"title": "Minio", "title": "Minio",
"description": "A distributed object storage server built for cloud applications and devops", "description": "A distributed object storage server built for cloud applications and devops",
"categories": ["storage"], "categories": ["storage"],
@@ -204,9 +203,11 @@
], ],
"volumes": ["/usr/src/app/localData", "/usr/src/app/localMetadata"] "volumes": ["/usr/src/app/localData", "/usr/src/app/localMetadata"]
}, },
======= {
"title": "SQL Server", "title": "SQL Server",
"description": "Microsoft SQL Server on Linux", "description": "Microsoft SQL Server on Linux",
"categories": ["database"],
"platform": "linux",
"note": "Password needs to include at least 8 characters including uppercase, lowercase letters, base-10 digits and/or non-alphanumeric symbols.", "note": "Password needs to include at least 8 characters including uppercase, lowercase letters, base-10 digits and/or non-alphanumeric symbols.",
"logo": "https://cloudinovasi.id/assets/img/logos/microsoft.png", "logo": "https://cloudinovasi.id/assets/img/logos/microsoft.png",
"image": "microsoft/mssql-server-linux:latest", "image": "microsoft/mssql-server-linux:latest",
@@ -227,6 +228,8 @@
{ {
"title": "SQL Server", "title": "SQL Server",
"description": "Microsoft SQL Server for Windows containers", "description": "Microsoft SQL Server for Windows containers",
"categories": ["database"],
"platform": "linux",
"note": "Password needs to include at least 8 characters including uppercase, lowercase letters, base-10 digits and/or non-alphanumeric symbols.", "note": "Password needs to include at least 8 characters including uppercase, lowercase letters, base-10 digits and/or non-alphanumeric symbols.",
"logo": "https://cloudinovasi.id/assets/img/logos/microsoft.png", "logo": "https://cloudinovasi.id/assets/img/logos/microsoft.png",
"image": "microsoft/mssql-server-windows:latest", "image": "microsoft/mssql-server-windows:latest",
@@ -248,6 +251,8 @@
{ {
"title": "SQL Server Express", "title": "SQL Server Express",
"description": "Microsoft SQL Server Express for Windows containers", "description": "Microsoft SQL Server Express for Windows containers",
"categories": ["database"],
"platform": "linux",
"note": "Password needs to include at least 8 characters including uppercase, lowercase letters, base-10 digits and/or non-alphanumeric symbols.", "note": "Password needs to include at least 8 characters including uppercase, lowercase letters, base-10 digits and/or non-alphanumeric symbols.",
"logo": "https://cloudinovasi.id/assets/img/logos/microsoft.png", "logo": "https://cloudinovasi.id/assets/img/logos/microsoft.png",
"image": "microsoft/mssql-server-windows-express:latest", "image": "microsoft/mssql-server-windows-express:latest",
@@ -267,27 +272,26 @@
"volumes": ["C:/temp/"] "volumes": ["C:/temp/"]
}, },
{ {
"title": "Minio", "title": "Minio",
"description": "A distributed object storage server built for cloud applications and devops", "description": "A distributed object storage server built for cloud applications and devops",
"logo": "https://cloudinovasi.id/assets/img/logos/minio.png", "logo": "https://cloudinovasi.id/assets/img/logos/minio.png",
"image": "minio/minio:latest", "image": "minio/minio:latest",
"ports": [ "ports": [
"9000/tcp" "9000/tcp"
], ],
"env": [ "env": [
{ {
"name": "MINIO_ACCESS_KEY", "name": "MINIO_ACCESS_KEY",
"label": "Minio access key" "label": "Minio access key"
}, },
{ {
"name": "MINIO_SECRET_KEY", "name": "MINIO_SECRET_KEY",
"label": "Minio secret key" "label": "Minio secret key"
} }
], ],
"volumes": ["/export", "/root/.minio"], "volumes": ["/export", "/root/.minio"],
"command": "server /export" "command": "server /export"
}, },
>>>>>>> templates-microsoft
{ {
"title": "Solr", "title": "Solr",
"description": "Open-source enterprise search platform", "description": "Open-source enterprise search platform",