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

[release] v0.4.0-unstable9

Browse source
This commit is contained in:
Yann Stepienik 2023-05-08 14:30:39 +01:00
parent 925070d0a3
commit 1f97b7bf29
8 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/src/pages/servapps/actionBar.jsx
View file

@ -17,6 +17,8 @@ const GetActions = ({
setIsUpdatingId(Id, true); setIsUpdatingId(Id, true);
API.docker.manageContainer(Id, action).then((res) => { API.docker.manageContainer(Id, action).then((res) => {
refreshServeApps(); refreshServeApps();
}).catch((err) => {
refreshServeApps();
}); });
}; };

2
client/src/pages/servapps/containers/overview.jsx
View file

@ -89,7 +89,7 @@ const ContainerOverview = ({ containerInfo, config, refresh }) => {
<Stack spacing={2} style={{ width: '100%' }} > <Stack spacing={2} style={{ width: '100%' }} >
<Stack spacing={2} direction={'row'} > <Stack spacing={2} direction={'row'} >
<GetActions <GetActions
Id={containerInfo.Id} Id={containerInfo.Name}
state={State.Status} state={State.Status}
refreshServeApps={() => { refreshServeApps={() => {
refreshAll() refreshAll()

4
client/src/pages/servapps/containers/volumes.jsx
View file

@ -59,11 +59,11 @@ const VolumeContainerSetup = ({ config, containerInfo, refresh }) => {
const errors = {}; const errors = {};
// check unique // check unique
const volumes = values.volumes.map((volume) => { const volumes = values.volumes.map((volume) => {
return `${volume.Destination}`; return `${volume.Target}`;
}); });
const unique = [...new Set(volumes)]; const unique = [...new Set(volumes)];
if (unique.length !== volumes.length) { if (unique.length !== volumes.length) {
errors.submit = 'Mounts must have unique destinations'; errors.submit = 'Mounts must have unique targets';
} }
return errors; return errors;
}} }}

2
client/src/pages/servapps/servapps.jsx
View file

@ -190,7 +190,7 @@ const ServeApps = () => {
{/* <Button variant="contained" size="small" onClick={() => {}}> {/* <Button variant="contained" size="small" onClick={() => {}}>
Update Update
</Button> */} </Button> */}
<GetActions Id={app.Id} state={app.State} setIsUpdatingId={setIsUpdatingId} refreshServeApps={refreshServeApps} /> <GetActions Id={app.Names[0].replace('/', '')} state={app.State} setIsUpdatingId={setIsUpdatingId} refreshServeApps={refreshServeApps} />
</Stack> </Stack>
</Stack> </Stack>
<Stack margin={1} direction="column" spacing={1} alignItems="flex-start"> <Stack margin={1} direction="column" spacing={1} alignItems="flex-start">

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "cosmos-server", "name": "cosmos-server",
"version": "0.4.0-unstable8", "version": "0.4.0-unstable9",
"description": "", "description": "",
"main": "test-server.js", "main": "test-server.js",
"bugs": { "bugs": {

6
src/docker/api_managecont.go
View file

@ -32,9 +32,9 @@ func ManageContainerRoute(w http.ResponseWriter, req *http.Request) {
// stop, start, restart, kill, remove, pause, unpause, recreate // stop, start, restart, kill, remove, pause, unpause, recreate
action := utils.Sanitize(vars["action"]) action := utils.Sanitize(vars["action"])
if os.Getenv("HOSTNAME") != "" && (action == "recreate" || action == "update") && containerName == os.Getenv("HOSTNAME") { if os.Getenv("HOSTNAME") != "" && containerName == os.Getenv("HOSTNAME") {
utils.Error("ManageContainer - cannot recreate/update self", nil) utils.Error("ManageContainer - Container cannot update itself", nil)
utils.HTTPError(w, "Cannot recreate/update self", http.StatusBadRequest, "DS003") utils.HTTPError(w, "Container cannot update itself", http.StatusBadRequest, "DS003")
return return
} }

4
src/docker/api_secureContainer.go
View file

@ -20,8 +20,8 @@ func SecureContainerRoute(w http.ResponseWriter, req *http.Request) {
status := utils.Sanitize(vars["status"]) status := utils.Sanitize(vars["status"])
if os.Getenv("HOSTNAME") != "" && containerName == os.Getenv("HOSTNAME") { if os.Getenv("HOSTNAME") != "" && containerName == os.Getenv("HOSTNAME") {
utils.Error("SecureContainerRoute - Cannot force secure self", nil) utils.Error("SecureContainerRoute - Container cannot update itself", nil)
utils.HTTPError(w, "Cannot force secure self", http.StatusBadRequest, "DS003") utils.HTTPError(w, "Container cannot update itself", http.StatusBadRequest, "DS003")
return return
} }

4
src/docker/api_updateContainer.go
View file

@ -40,8 +40,8 @@ func UpdateContainerRoute(w http.ResponseWriter, req *http.Request) {
containerName := utils.Sanitize(vars["containerId"]) containerName := utils.Sanitize(vars["containerId"])
if os.Getenv("HOSTNAME") != "" && containerName == os.Getenv("HOSTNAME") { if os.Getenv("HOSTNAME") != "" && containerName == os.Getenv("HOSTNAME") {
utils.Error("SecureContainerRoute - Cannot update self", nil) utils.Error("SecureContainerRoute - Container cannot update itself", nil)
utils.HTTPError(w, "Cannot update self", http.StatusBadRequest, "DS003") utils.HTTPError(w, "Container cannot update itself", http.StatusBadRequest, "DS003")
return return
} }