beenull/Cosmos-Server
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[release] version 0.5.0-unstable4

Browse source
This commit is contained in:
Yann Stepienik 2023-05-14 13:23:04 +01:00
parent 3cbd88f4a6
commit 62ec6ad308
4 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
client/src/pages/servapps/containers/docker-compose.jsx
View file

@ -76,6 +76,7 @@ const DockerComposeImport = () => {
return;
}
setYmlError('');
let doc;
let newService = {};
try {
@ -110,6 +111,11 @@ const DockerComposeImport = () => {
return ''+port;
})
}
//convert user
if(doc.services[key].user) {
doc.services[key].user = '' + doc.services[key].user;
}
});
}

6
client/src/utils/docker.js
View file

@ -29,11 +29,11 @@ export const tryParseProgressLog = (log) => {
try {
const parsedLog = JSON.parse(log);
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) {
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) {
return `${parsedLog.id} ${parsedLog.status} ${parsedLog.sha256 || ""}`
return `${parsedLog.id || ""} ${parsedLog.status} ${parsedLog.sha256 || ""}`
}
return log;
} catch (e) {

2
package.json
View file

@ -1,6 +1,6 @@
{
"name": "cosmos-server",
"version": "0.5.0-unstable3",
"version": "0.5.0-unstable4",
"description": "",
"main": "test-server.js",
"bugs": {

30
src/docker/api_blueprint.go
View file

@ -379,22 +379,24 @@ func CreateServiceRoute(w http.ResponseWriter, req *http.Request) {
return
}
// Change the ownership of the directory to the container.User
userInfo, err := user.Lookup(container.User)
if err != nil {
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 container.User != "" {
// Change the ownership of the directory to the container.User
userInfo, err := user.Lookup(container.User)
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())
utils.Error("CreateService: Unable to lookup user", err)
fmt.Fprintf(w, "[ERROR] Unable to lookup user " + container.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 {
utils.Error("CreateService: Unable to change ownership of directory", err)
fmt.Fprintf(w, "[ERROR] Unable to change ownership of directory: "+err.Error())
flusher.Flush()
}
}
}
}
}
}