Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

implementation of docker status check #449

Draft
wants to merge 13 commits into
base: dev
Choose a base branch
from
Draft

implementation of docker status check #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b3b4adf
changing logic startup docker.service
lunardunno Nov 15, 2023
4216e50
Improve logic of startup docker.service
lunardunno Nov 17, 2023
77a411f
Script_minimization_Ubuntu_fix
lunardunno Nov 19, 2023
50d9152
excluding for dist debian
lunardunno Nov 19, 2023
1cbb7e8
test version
lunardunno Nov 21, 2023
bfc88ff
docker replaced with sudo
lunardunno Nov 21, 2023
ddb05d5
test v2
lunardunno Nov 22, 2023
e25d153
test 3
lunardunno Nov 22, 2023
394390e
test L18
lunardunno Nov 22, 2023
acfb021
changes for test "Failed to"
lunardunno Nov 22, 2023
b11c6fc
introduction "Failed to" for install_docker.sh
lunardunno Nov 22, 2023
9d49c5f
checking docker status
lunardunno Dec 2, 2023
08c506a
checking docker status
lunardunno Dec 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions client/core/servercontroller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,8 @@ ErrorCode ServerController::installDockerWorker(const ServerCredentials &credent
return ErrorCode::ServerPacketManagerError;
if (stdOut.contains("command not found"))
return ErrorCode::ServerDockerFailedError;
if (stdOut.contains("Docker status is not active"))
return ErrorCode::ServerDockerFailedError;

return error;
}
Expand Down
2 changes: 1 addition & 1 deletion client/server_scripts/install_docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ if [ "$dist" = "debian" ]; then \
if [ -z "$docker_service" ]; then sudo $pm update -yq; sudo $pm install -yq curl $docker_pkg; fi;\
sleep 3 && sudo systemctl start docker && sleep 3;\
fi;\
if ! command -v sudo > /dev/null 2>&1; then echo "Failed to install Docker";exit 1;fi;\
if [ "$(systemctl is-active docker)" != "active" ]; then echo "Docker status is not active"; fi;\
docker --version