AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix error description

Browse source 
Fix error description for podman-docker.
Checking the docker version via sudo, for correct detection of podman-docker.
This commit is contained in:
lunardunno 2025-04-07 07:26:17 +04:00
parent ed1d67fcdf
commit 8331b9ea52
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/core/controllers/serverController.cpp
View file

@ -409,8 +409,8 @@ ErrorCode ServerController::installDockerWorker(const ServerCredentials &credent
qDebug().noquote() << "ServerController::installDockerWorker" << stdOut; qDebug().noquote() << "ServerController::installDockerWorker" << stdOut;
if (stdOut.contains("lock")) if (stdOut.contains("lock"))
return ErrorCode::ServerPacketManagerError; return ErrorCode::ServerPacketManagerError;
if (stdOut.contains("Docker is not supported")) if (stdOut.contains("Podman is not supported"))
return ErrorCode::ServerDockerNotSupported; return ErrorCode::ServerPodmanIsNotSupported;
if (stdOut.contains("command not found")) if (stdOut.contains("command not found"))
return ErrorCode::ServerDockerFailedError; return ErrorCode::ServerDockerFailedError;

2
client/core/defs.h
View file

@ -58,7 +58,7 @@ namespace amnezia
ServerUserDirectoryNotAccessible = 208, ServerUserDirectoryNotAccessible = 208,
ServerUserNotAllowedInSudoers = 209, ServerUserNotAllowedInSudoers = 209,
ServerUserPasswordRequired = 210, ServerUserPasswordRequired = 210,
ServerDockerNotSupported = 211, ServerPodmanIsNotSupported = 211,
// Ssh connection errors // Ssh connection errors
SshRequestDeniedError = 300, SshRequestDeniedError = 300,

2
client/core/errorstrings.cpp
View file

@ -26,7 +26,7 @@ QString errorString(ErrorCode code) {
case(ErrorCode::ServerUserDirectoryNotAccessible): errorMessage = QObject::tr("The server user's home directory is not accessible"); break; case(ErrorCode::ServerUserDirectoryNotAccessible): errorMessage = QObject::tr("The server user's home directory is not accessible"); break;
case(ErrorCode::ServerUserNotAllowedInSudoers): errorMessage = QObject::tr("Action not allowed in sudoers"); break; case(ErrorCode::ServerUserNotAllowedInSudoers): errorMessage = QObject::tr("Action not allowed in sudoers"); break;
case(ErrorCode::ServerUserPasswordRequired): errorMessage = QObject::tr("The user's password is required"); break; case(ErrorCode::ServerUserPasswordRequired): errorMessage = QObject::tr("The user's password is required"); break;
case(ErrorCode::ServerDockerNotSupported): errorMessage = QObject::tr("Docker which is for the server is not supported"); break; case(ErrorCode::ServerPodmanIsNotSupported): errorMessage = QObject::tr("Server error: podman-docker is not supported"); break;
// Libssh errors // Libssh errors
case(ErrorCode::SshRequestDeniedError): errorMessage = QObject::tr("SSH request was denied"); break; case(ErrorCode::SshRequestDeniedError): errorMessage = QObject::tr("SSH request was denied"); break;

6
client/server_scripts/install_docker.sh
View file

@ -12,7 +12,7 @@ if ! command -v docker > /dev/null 2>&1; then \
sudo $pm $check_pkgs;\ sudo $pm $check_pkgs;\
if [ -z "$(sudo $pm $what_pkg $docker_pkg 2>/dev/null | grep podman)" ];\ if [ -z "$(sudo $pm $what_pkg $docker_pkg 2>/dev/null | grep podman)" ];\
then sudo $pm $silent_inst $docker_pkg;\ then sudo $pm $silent_inst $docker_pkg;\
else echo "Docker is not supported"; exit 1;\ else echo "Podman is not supported"; exit 1;\
fi;\ fi;\
sleep 5; sudo systemctl enable --now docker; sleep 5;\ sleep 5; sudo systemctl enable --now docker; sleep 5;\
fi;\ fi;\
@ -27,8 +27,8 @@ if [ "$(systemctl is-active docker)" != "active" ]; then \
then sudo $pm $silent_inst $docker_pkg;\ then sudo $pm $silent_inst $docker_pkg;\
fi;\ fi;\
sleep 5; sudo systemctl start docker; sleep 5;\ sleep 5; sudo systemctl start docker; sleep 5;\
else echo "Docker is not supported";\ else echo "Podman is not supported";\
fi;\ fi;\
fi;\ fi;\
if ! command -v sudo > /dev/null 2>&1; then echo "Failed to install sudo, command not found"; exit 1; fi;\ if ! command -v sudo > /dev/null 2>&1; then echo "Failed to install sudo, command not found"; exit 1; fi;\
docker --version sudo docker --version