From eadd3c277a341e95be579d234f294503e81f306c Mon Sep 17 00:00:00 2001 From: Darren <27513732@qq.com> Date: Sat, 7 Oct 2023 16:00:55 +0800 Subject: [PATCH] fix --- changelog_latest.md | 3 ++- cockpit/menu_override/apps.override.json | 1 - cockpit/menu_override/kdump.override.json | 1 - cockpit/menu_override/machines.override.json | 3 +-- cockpit/menu_override/packagekit.override.json | 1 - cockpit/menu_override/playground.override.json | 4 ---- cockpit/menu_override/selinux.override.json | 1 - .../menu_override/session-recording.override.json | 3 +-- cockpit/menu_override/sosreport.override.json | 1 - cockpit/menu_override/subscriptions.override.json | 1 - cockpit/menu_override/updates.override.json | 1 - docs/user.md | 12 +++++++++--- install/install.sh | 14 ++++++++++++++ install/install_docker.sh | 5 ++--- version.json | 2 +- 15 files changed, 30 insertions(+), 23 deletions(-) delete mode 100644 cockpit/menu_override/playground.override.json diff --git a/changelog_latest.md b/changelog_latest.md index 7ca28343..8bb6b2d5 100644 --- a/changelog_latest.md +++ b/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 diff --git a/cockpit/menu_override/apps.override.json b/cockpit/menu_override/apps.override.json index 437ef46f..48854458 100644 --- a/cockpit/menu_override/apps.override.json +++ b/cockpit/menu_override/apps.override.json @@ -1,4 +1,3 @@ { - "menu": null, "tools": null } \ No newline at end of file diff --git a/cockpit/menu_override/kdump.override.json b/cockpit/menu_override/kdump.override.json index 437ef46f..48854458 100644 --- a/cockpit/menu_override/kdump.override.json +++ b/cockpit/menu_override/kdump.override.json @@ -1,4 +1,3 @@ { - "menu": null, "tools": null } \ No newline at end of file diff --git a/cockpit/menu_override/machines.override.json b/cockpit/menu_override/machines.override.json index 437ef46f..b7b9fff9 100644 --- a/cockpit/menu_override/machines.override.json +++ b/cockpit/menu_override/machines.override.json @@ -1,4 +1,3 @@ { - "menu": null, - "tools": null + "menu": null } \ No newline at end of file diff --git a/cockpit/menu_override/packagekit.override.json b/cockpit/menu_override/packagekit.override.json index 437ef46f..48854458 100644 --- a/cockpit/menu_override/packagekit.override.json +++ b/cockpit/menu_override/packagekit.override.json @@ -1,4 +1,3 @@ { - "menu": null, "tools": null } \ No newline at end of file diff --git a/cockpit/menu_override/playground.override.json b/cockpit/menu_override/playground.override.json deleted file mode 100644 index 437ef46f..00000000 --- a/cockpit/menu_override/playground.override.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "menu": null, - "tools": null -} \ No newline at end of file diff --git a/cockpit/menu_override/selinux.override.json b/cockpit/menu_override/selinux.override.json index 437ef46f..48854458 100644 --- a/cockpit/menu_override/selinux.override.json +++ b/cockpit/menu_override/selinux.override.json @@ -1,4 +1,3 @@ { - "menu": null, "tools": null } \ No newline at end of file diff --git a/cockpit/menu_override/session-recording.override.json b/cockpit/menu_override/session-recording.override.json index 437ef46f..b7b9fff9 100644 --- a/cockpit/menu_override/session-recording.override.json +++ b/cockpit/menu_override/session-recording.override.json @@ -1,4 +1,3 @@ { - "menu": null, - "tools": null + "menu": null } \ No newline at end of file diff --git a/cockpit/menu_override/sosreport.override.json b/cockpit/menu_override/sosreport.override.json index 437ef46f..48854458 100644 --- a/cockpit/menu_override/sosreport.override.json +++ b/cockpit/menu_override/sosreport.override.json @@ -1,4 +1,3 @@ { - "menu": null, "tools": null } \ No newline at end of file diff --git a/cockpit/menu_override/subscriptions.override.json b/cockpit/menu_override/subscriptions.override.json index 437ef46f..48854458 100644 --- a/cockpit/menu_override/subscriptions.override.json +++ b/cockpit/menu_override/subscriptions.override.json @@ -1,4 +1,3 @@ { - "menu": null, "tools": null } \ No newline at end of file diff --git a/cockpit/menu_override/updates.override.json b/cockpit/menu_override/updates.override.json index 437ef46f..48854458 100644 --- a/cockpit/menu_override/updates.override.json +++ b/cockpit/menu_override/updates.override.json @@ -1,4 +1,3 @@ { - "menu": null, "tools": null } \ No newline at end of file diff --git a/docs/user.md b/docs/user.md index c843093f..84c30f9e 100644 --- a/docs/user.md +++ b/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? diff --git a/install/install.sh b/install/install.sh index 2f60b3f4..31c68838 100644 --- a/install/install.sh +++ b/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 diff --git a/install/install_docker.sh b/install/install_docker.sh index 30661733..43acaa7d 100644 --- a/install/install_docker.sh +++ b/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] - ' @@ -98,7 +96,8 @@ else export -f Install_Docker timeout 300 bash -c Install_Docker if [ $? -eq 124 ]; then - echo "Install Docker timed out, Docker packages maybe can't download" + echo "Install Docker timed out, Docker packages maybe can't download" + exit 1 fi fi } diff --git a/version.json b/version.json index 6e5c7b42..5b1d907c 100644 --- a/version.json +++ b/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",