[release] v0.14.0-unstable22

azukaar · Feb 10, 2024 · 2122d2d · 2122d2d
1 parent 6aa0ffe
commit 2122d2d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/changelog.md b/changelog.md
@@ -21,6 +21,7 @@
  - Add duplicate filter on store listing
  - Fixed an issue where container picker would select 'null' as container
  - Fix bug where Enabled checkbox was broken after a search
+ - remove mac address when switching to host mode
 
 ## Version 0.13.2
  - Fix display issue with fault network configurations

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cosmos-server",
-  "version": "0.14.0-unstable21",
+  "version": "0.14.0-unstable22",
   "description": "",
   "main": "test-server.js",
   "bugs": {

diff --git a/src/docker/api_updateContainer.go b/src/docker/api_updateContainer.go
@@ -120,6 +120,11 @@ func UpdateContainerRoute(w http.ResponseWriter, req *http.Request) {
 		}
 		if(form.NetworkMode != "") {
 			container.HostConfig.NetworkMode = containerType.NetworkMode(form.NetworkMode)
+			// if not bridge, remove mac address
+			if form.NetworkMode != "bridge" &&
+				 form.NetworkMode != "default" {
+					container.Config.MacAddress = ""
+			}
 		}
 
 		_, err = EditContainer(container.ID, container, false)

diff --git a/src/docker/checkPorts.go b/src/docker/checkPorts.go
@@ -168,7 +168,5 @@ func UpdatePorts(finalPorts []string) error {
 		return err
 	}
 
-	go redirectLogs("cosmos-self-updater-agent", utils.CONFIGFOLDER + "/logs-cosmos-self-updater-agent.log")
-
 	return nil
 }
diff --git a/src/docker/docker.go b/src/docker/docker.go
@@ -588,9 +588,12 @@ func RemoveSelfUpdater() error {
 		return err
 	}
 
+
 	for _, container := range containers {
 		if container.Names[0] == "/cosmos-self-updater-agent" {
-			utils.Log("Found. Removing self updater agent")
+			utils.Log("Found. Copying logs and removing self updater agent")
+			redirectLogs("cosmos-self-updater-agent", utils.CONFIGFOLDER + "/logs-cosmos-self-updater-agent.log")
+
 			err := DockerClient.ContainerKill(DockerContext, container.ID, "SIGKILL")
 			if err != nil {
 				utils.Error("RemoveSelfUpdater", err)
@@ -675,9 +678,6 @@ func SelfAction(action string) error {
 		return err
 	}
 
-	// attach logs
-	go redirectLogs("cosmos-self-updater-agent", utils.CONFIGFOLDER + "/logs-cosmos-self-updater-agent.log")
-
 	return nil
 }
 
@@ -686,7 +686,7 @@ func redirectLogs(containerName string, logFile string) {
 	logs, err := DockerClient.ContainerLogs(DockerContext, containerName, types.ContainerLogsOptions{
 		ShowStdout: true,
 		ShowStderr: true,
-		Follow: true,
+		Follow: false,
 	})
 	if err != nil {
 		utils.Error("redirectLogs", err)