[release] version 0.5.0-unstable4
This commit is contained in:
parent
3cbd88f4a6
commit
62ec6ad308
|
@ -76,6 +76,7 @@ const DockerComposeImport = () => {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setYmlError('');
|
||||||
let doc;
|
let doc;
|
||||||
let newService = {};
|
let newService = {};
|
||||||
try {
|
try {
|
||||||
|
@ -110,6 +111,11 @@ const DockerComposeImport = () => {
|
||||||
return ''+port;
|
return ''+port;
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//convert user
|
||||||
|
if(doc.services[key].user) {
|
||||||
|
doc.services[key].user = '' + doc.services[key].user;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -29,11 +29,11 @@ export const tryParseProgressLog = (log) => {
|
||||||
try {
|
try {
|
||||||
const parsedLog = JSON.parse(log);
|
const parsedLog = JSON.parse(log);
|
||||||
if (parsedLog.status && parsedLog.progress) {
|
if (parsedLog.status && parsedLog.progress) {
|
||||||
return `${parsedLog.id} ${parsedLog.status} ${parsedLog.progress}`
|
return `${parsedLog.id || ""} ${parsedLog.status} ${parsedLog.progress}`
|
||||||
} else if (parsedLog.status && parsedLog.progressDetail && parsedLog.progressDetail.current) {
|
} else if (parsedLog.status && parsedLog.progressDetail && parsedLog.progressDetail.current) {
|
||||||
return `${parsedLog.id} ${parsedLog.status} ${parsedLog.progressDetail.current}/${parsedLog.progressDetail.total}`
|
return `${parsedLog.id || ""} ${parsedLog.status} ${parsedLog.progressDetail.current}/${parsedLog.progressDetail.total}`
|
||||||
} else if (parsedLog.status) {
|
} else if (parsedLog.status) {
|
||||||
return `${parsedLog.id} ${parsedLog.status} ${parsedLog.sha256 || ""}`
|
return `${parsedLog.id || ""} ${parsedLog.status} ${parsedLog.sha256 || ""}`
|
||||||
}
|
}
|
||||||
return log;
|
return log;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "cosmos-server",
|
"name": "cosmos-server",
|
||||||
"version": "0.5.0-unstable3",
|
"version": "0.5.0-unstable4",
|
||||||
"description": "",
|
"description": "",
|
||||||
"main": "test-server.js",
|
"main": "test-server.js",
|
||||||
"bugs": {
|
"bugs": {
|
||||||
|
|
|
@ -379,22 +379,24 @@ func CreateServiceRoute(w http.ResponseWriter, req *http.Request) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Change the ownership of the directory to the container.User
|
if container.User != "" {
|
||||||
userInfo, err := user.Lookup(container.User)
|
// Change the ownership of the directory to the container.User
|
||||||
if err != nil {
|
userInfo, err := user.Lookup(container.User)
|
||||||
utils.Error("CreateService: Unable to lookup user", err)
|
|
||||||
fmt.Fprintf(w, "[ERROR] Unable to lookup user: "+err.Error())
|
|
||||||
flusher.Flush()
|
|
||||||
} else {
|
|
||||||
uid, _ := strconv.Atoi(userInfo.Uid)
|
|
||||||
gid, _ := strconv.Atoi(userInfo.Gid)
|
|
||||||
err = os.Chown(newmount.Source, uid, gid)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
utils.Error("CreateService: Unable to change ownership of directory", err)
|
utils.Error("CreateService: Unable to lookup user", err)
|
||||||
fmt.Fprintf(w, "[ERROR] Unable to change ownership of directory: "+err.Error())
|
fmt.Fprintf(w, "[ERROR] Unable to lookup user " + container.User + "." +err.Error())
|
||||||
flusher.Flush()
|
flusher.Flush()
|
||||||
}
|
} else {
|
||||||
}
|
uid, _ := strconv.Atoi(userInfo.Uid)
|
||||||
|
gid, _ := strconv.Atoi(userInfo.Gid)
|
||||||
|
err = os.Chown(newmount.Source, uid, gid)
|
||||||
|
if err != nil {
|
||||||
|
utils.Error("CreateService: Unable to change ownership of directory", err)
|
||||||
|
fmt.Fprintf(w, "[ERROR] Unable to change ownership of directory: "+err.Error())
|
||||||
|
flusher.Flush()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue