fix

changelog_latest.md

@@ -1 +1,2 @@
-1. Fix install error: cockpit port replace
+1. Fix install error: Cockpit override files
+2. Fix install: Docker error then exit 1

cockpit/menu_override/apps.override.json

@@ -1,4 +1,3 @@
 {
-    "menu": null,
     "tools": null
 }

cockpit/menu_override/kdump.override.json

@@ -1,4 +1,3 @@
 {
-    "menu": null,
     "tools": null
 }

cockpit/menu_override/machines.override.json

@@ -1,4 +1,3 @@
 {
-    "menu": null,
-    "tools": null
+    "menu": null
 }

cockpit/menu_override/packagekit.override.json

@@ -1,4 +1,3 @@
 {
-    "menu": null,
     "tools": null
 }

cockpit/menu_override/playground.override.json

@@ -1,4 +0,0 @@
-{
-    "menu": null,
-    "tools": null
-}

cockpit/menu_override/selinux.override.json

@@ -1,4 +1,3 @@
 {
-    "menu": null,
     "tools": null
 }

cockpit/menu_override/session-recording.override.json

@@ -1,4 +1,3 @@
 {
-    "menu": null,
-    "tools": null
+    "menu": null
 }

cockpit/menu_override/sosreport.override.json

@@ -1,4 +1,3 @@
 {
-    "menu": null,
     "tools": null
 }

cockpit/menu_override/subscriptions.override.json

@@ -1,4 +1,3 @@
 {
-    "menu": null,
     "tools": null
 }

cockpit/menu_override/updates.override.json

@@ -1,4 +1,3 @@
 {
-    "menu": null,
     "tools": null
 }

docs/user.md

@@ -10,12 +10,18 @@ usermod -aG wheel username
 usermod -aG sudo username
 
 # sudo not need to input password
-
 ```
 
-#### Can not login when I reinstall my Instance?
+#### Can not login with correct credential?
 
-Need to clear all cookie at you browser
+Many reason may make you login failed with the correct credential:
+
+- Cookie at you browser if IP change, need to clear cookie
+- *.override.json is not correct
+- TLS certificate
+- User not allowed login, need to modify ssh_config file
+
+More details, you can get it from `sudo grep cockpit /var/log/messages`
 
 #### How to modify Websoft9 port?
 

install/install.sh

@@ -345,8 +345,22 @@ install_tools
 download_source
 
 bash $install_path/install/install_docker.sh
+if [ $? -ne 0 ]; then
+    echo "install_docker failed with error $?. Exiting."
+    exit 1
+fi
+
 bash $install_path/install/install_cockpit.sh
+if [ $? -ne 0 ]; then
+    echo "install_cockpit failed with error $?. Exiting."
+    exit 1
+fi
+
 bash $install_path/install/install_plugins.sh
+if [ $? -ne 0 ]; then
+    echo "install_plugins failed with error $?. Exiting."
+    exit 1
+fi
 
 install_backends
 install_systemd

install/install_docker.sh

@@ -24,8 +24,6 @@ export PATH
 #
 #   $ sudo sh install_docker.sh
 
-
-
 docker_packages="docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin"
 echo_prefix_docker=$'\n[Docker] - '
 
@@ -99,6 +97,7 @@ else
     timeout 300 bash -c Install_Docker
     if [ $? -eq 124 ]; then
       echo "Install Docker timed out, Docker packages maybe can't download"
+      exit 1
     fi
 fi
 }

version.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.8.26-rc7",
+  "version": "0.8.26-rc8",
   "plugins": {
     "portainer": "0.0.6",
     "nginx": "0.0.5",