[release] 0.5.7-unstable
This commit is contained in:
parent
7a204021f1
commit
2989f97610
|
@ -86,7 +86,15 @@ const DockerComposeImport = ({refresh}) => {
|
||||||
setYmlError(e.message);
|
setYmlError(e.message);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (typeof doc === 'object' && doc !== null && Object.keys(doc).length > 0 &&
|
||||||
|
!doc.services && !doc.networks && !doc.volumes) {
|
||||||
|
doc = {
|
||||||
|
services: Object.assign({}, doc)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// convert to the proper format
|
// convert to the proper format
|
||||||
if(doc.services) {
|
if(doc.services) {
|
||||||
Object.keys(doc.services).forEach((key) => {
|
Object.keys(doc.services).forEach((key) => {
|
||||||
|
@ -129,6 +137,16 @@ const DockerComposeImport = ({refresh}) => {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// convert environment
|
||||||
|
if(doc.services[key].environment) {
|
||||||
|
if(!Array.isArray(doc.services[key].environment)) {
|
||||||
|
let environment = [];
|
||||||
|
Object.keys(doc.services[key].environment).forEach((keyenv) => {
|
||||||
|
environment.push(keyenv + '=' + doc.services[key].environment[keyenv]);
|
||||||
|
});
|
||||||
|
doc.services[key].environment = environment;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// convert network
|
// convert network
|
||||||
if(doc.services[key].networks) {
|
if(doc.services[key].networks) {
|
||||||
|
@ -140,6 +158,11 @@ const DockerComposeImport = ({refresh}) => {
|
||||||
doc.services[key].networks = networks;
|
doc.services[key].networks = networks;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ensure container_name
|
||||||
|
if(!doc.services[key].container_name) {
|
||||||
|
doc.services[key].container_name = key;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "cosmos-server",
|
"name": "cosmos-server",
|
||||||
"version": "0.5.6",
|
"version": "0.5.7-unstable",
|
||||||
"description": "",
|
"description": "",
|
||||||
"main": "test-server.js",
|
"main": "test-server.js",
|
||||||
"bugs": {
|
"bugs": {
|
||||||
|
|
|
@ -27,7 +27,7 @@ func NewDB(w http.ResponseWriter, req *http.Request) (string, error) {
|
||||||
mongoPass := utils.GenerateRandomString(24)
|
mongoPass := utils.GenerateRandomString(24)
|
||||||
monHost := "cosmos-mongo-" + id
|
monHost := "cosmos-mongo-" + id
|
||||||
|
|
||||||
imageName := "mongo:5"
|
imageName := "mongo:latest"
|
||||||
|
|
||||||
// if CPU is missing AVX, use 4.4
|
// if CPU is missing AVX, use 4.4
|
||||||
if runtime.GOARCH == "amd64" && !cpu.X86.HasAVX {
|
if runtime.GOARCH == "amd64" && !cpu.X86.HasAVX {
|
||||||
|
@ -37,6 +37,14 @@ func NewDB(w http.ResponseWriter, req *http.Request) (string, error) {
|
||||||
|
|
||||||
service := DockerServiceCreateRequest{
|
service := DockerServiceCreateRequest{
|
||||||
Services: map[string]ContainerCreateRequestContainer {},
|
Services: map[string]ContainerCreateRequestContainer {},
|
||||||
|
Volumes: []ContainerCreateRequestVolume{
|
||||||
|
ContainerCreateRequestVolume{
|
||||||
|
Name: "cosmos-mongo-data-" + id,
|
||||||
|
},
|
||||||
|
ContainerCreateRequestVolume{
|
||||||
|
Name: "cosmos-mongo-config-" + id,
|
||||||
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
service.Services[monHost] = ContainerCreateRequestContainer{
|
service.Services[monHost] = ContainerCreateRequestContainer{
|
||||||
|
|
Loading…
Reference in a new issue