From d28a4fe6439fa00564ec4dcf4d4d4cb5d1ae034d Mon Sep 17 00:00:00 2001 From: charankamarapu Date: Wed, 14 Feb 2024 12:09:12 +0000 Subject: [PATCH 1/5] fix: add netwoek in linux Signed-off-by: charankamarapu --- keploy.sh | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/keploy.sh b/keploy.sh index b8c7a4c9b..c6a58b62a 100644 --- a/keploy.sh +++ b/keploy.sh @@ -20,6 +20,8 @@ installKeploy (){ sudo mkdir -p /usr/local/bin && sudo mv /tmp/keploy /usr/local/bin/keploybin set_alias 'sudo -E env PATH="$PATH" keploybin' + + add_network } check_sudo(){ @@ -36,6 +38,8 @@ installKeploy (){ sudo mkdir -p /usr/local/bin && sudo mv /tmp/keploy /usr/local/bin/keploybin set_alias 'sudo -E env PATH="$PATH" keploybin' + + add_network } append_to_rc() { @@ -96,9 +100,15 @@ installKeploy (){ fi } - - - install_docker() { + add_network() { + if ! which docker &> /dev/null; then + echo -n "Docker not found on device, please install docker and reinstall keploy if you are willing to use applications with docker" + return + fi + if ! docker info &> /dev/null; then + echo "Please start Docker and reinstall keploy if you are willing to use applications with docker" + return + fi check_sudo sudoCheck=$? network_alias="" @@ -109,7 +119,9 @@ installKeploy (){ if ! $network_alias docker network ls | grep -q 'keploy-network'; then $network_alias docker network create keploy-network fi + } + install_docker() { if [ "$OS_NAME" = "Darwin" ]; then if ! docker volume inspect debugfs &>/dev/null; then docker volume create --driver local --opt type=debugfs --opt device=debugfs debugfs From 36afde9fdfcd0d6b253b2185fa7fb93d58d77019 Mon Sep 17 00:00:00 2001 From: charankamarapu Date: Mon, 19 Feb 2024 09:24:00 +0000 Subject: [PATCH 2/5] fix: add network in docker] Signed-off-by: charankamarapu --- keploy.sh | 62 +++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 20 deletions(-) diff --git a/keploy.sh b/keploy.sh index c6a58b62a..8b2757b89 100644 --- a/keploy.sh +++ b/keploy.sh @@ -21,6 +21,11 @@ installKeploy (){ set_alias 'sudo -E env PATH="$PATH" keploybin' + check_docker_status_for_linux + dockerStatus=$? + if [ "$dockerStatus" -eq 0 ]; then + return + fi add_network } @@ -39,6 +44,11 @@ installKeploy (){ set_alias 'sudo -E env PATH="$PATH" keploybin' + check_docker_status_for_linux + dockerStatus=$? + if [ "$dockerStatus" -eq 0 ]; then + return + fi add_network } @@ -100,15 +110,7 @@ installKeploy (){ fi } - add_network() { - if ! which docker &> /dev/null; then - echo -n "Docker not found on device, please install docker and reinstall keploy if you are willing to use applications with docker" - return - fi - if ! docker info &> /dev/null; then - echo "Please start Docker and reinstall keploy if you are willing to use applications with docker" - return - fi + check_docker_status_for_linux() { check_sudo sudoCheck=$? network_alias="" @@ -116,6 +118,31 @@ installKeploy (){ # Add sudo to docker network_alias="sudo" fi + if ! $network_alias which docker &> /dev/null; then + echo -n "Docker not found on device, please install docker and reinstall keploy if you are willing to use applications with docker" + return 0 + fi + if ! $network_alias docker info &> /dev/null; then + echo "Please start Docker and reinstall keploy if you are willing to use applications with docker" + return 0 + fi + return 1 + } + + check_docker_status_for_Darwin() { + if ! which docker &> /dev/null; then + echo -n "Docker not found on device, please install docker to use Keploy" + return 0 + fi + # Check if docker is running + if ! docker info &> /dev/null; then + echo "Keploy only supports intercepting and replaying docker containers on macOS, and requires Docker to be installed and running. Please start Docker and try again." + return 0 + fi + return 1 + } + + add_network() { if ! $network_alias docker network ls | grep -q 'keploy-network'; then $network_alias docker network create keploy-network fi @@ -123,6 +150,12 @@ installKeploy (){ install_docker() { if [ "$OS_NAME" = "Darwin" ]; then + check_docker_status_for_Darwin + dockerStatus=$? + if [ "$dockerStatus" -eq 0 ]; then + return + fi + add_network if ! docker volume inspect debugfs &>/dev/null; then docker volume create --driver local --opt type=debugfs --opt device=debugfs debugfs fi @@ -138,19 +171,8 @@ installKeploy (){ if [ "$IS_CI" = false ]; then OS_NAME="$(uname -s)" if [ "$OS_NAME" = "Darwin" ]; then - if ! which docker &> /dev/null; then - echo -n "Docker not found on device, please install docker to use Keploy" - return - fi - - # Check if docker is running - if ! docker info &> /dev/null; then - echo "Keploy only supports intercepting and replaying docker containers on macOS, and requires Docker to be installed and running. Please start Docker and try again." - return - fi install_docker return - elif [ "$OS_NAME" = "Linux" ]; then if ! sudo mountpoint -q /sys/kernel/debug; then sudo mount -t debugfs debugfs /sys/kernel/debug From 1f30dc10a9df973452609af1e21334cd0d2bc6a9 Mon Sep 17 00:00:00 2001 From: charankamarapu Date: Mon, 19 Feb 2024 09:29:42 +0000 Subject: [PATCH 3/5] fix: add sudo for mac Signed-off-by: charankamarapu --- keploy.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/keploy.sh b/keploy.sh index 8b2757b89..087f595ea 100644 --- a/keploy.sh +++ b/keploy.sh @@ -130,12 +130,19 @@ installKeploy (){ } check_docker_status_for_Darwin() { - if ! which docker &> /dev/null; then + check_sudo + sudoCheck=$? + network_alias="" + if [ "$sudoCheck" -eq 0 ] && [ $OS_NAME = "Linux" ]; then + # Add sudo to docker + network_alias="sudo" + fi + if ! $network_alias which docker &> /dev/null; then echo -n "Docker not found on device, please install docker to use Keploy" return 0 fi # Check if docker is running - if ! docker info &> /dev/null; then + if ! $network_alias docker info &> /dev/null; then echo "Keploy only supports intercepting and replaying docker containers on macOS, and requires Docker to be installed and running. Please start Docker and try again." return 0 fi From 0cf17f18ad89e6fa2712e2c0568add5d5760370e Mon Sep 17 00:00:00 2001 From: charankamarapu Date: Wed, 21 Feb 2024 20:03:30 +0000 Subject: [PATCH 4/5] fix: add darwin Signed-off-by: charankamarapu --- keploy.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keploy.sh b/keploy.sh index 087f595ea..0daeec9f0 100644 --- a/keploy.sh +++ b/keploy.sh @@ -119,11 +119,11 @@ installKeploy (){ network_alias="sudo" fi if ! $network_alias which docker &> /dev/null; then - echo -n "Docker not found on device, please install docker and reinstall keploy if you are willing to use applications with docker" + echo -n "Docker not found on device, please install docker and reinstall keploy if you have applications running on docker" return 0 fi if ! $network_alias docker info &> /dev/null; then - echo "Please start Docker and reinstall keploy if you are willing to use applications with docker" + echo "Please start Docker and reinstall keploy if you have applications running on docker" return 0 fi return 1 @@ -133,7 +133,7 @@ installKeploy (){ check_sudo sudoCheck=$? network_alias="" - if [ "$sudoCheck" -eq 0 ] && [ $OS_NAME = "Linux" ]; then + if [ "$sudoCheck" -eq 0 ] && [ $OS_NAME = "Darwin" ]; then # Add sudo to docker network_alias="sudo" fi From c3ba3b74770443dce797b72ce601f83b7ae999e3 Mon Sep 17 00:00:00 2001 From: charankamarapu Date: Thu, 22 Feb 2024 08:47:16 +0000 Subject: [PATCH 5/5] fix: remove && condition Signed-off-by: charankamarapu --- keploy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keploy.sh b/keploy.sh index 0daeec9f0..796c15a9e 100644 --- a/keploy.sh +++ b/keploy.sh @@ -114,7 +114,7 @@ installKeploy (){ check_sudo sudoCheck=$? network_alias="" - if [ "$sudoCheck" -eq 0 ] && [ $OS_NAME = "Linux" ]; then + if [ "$sudoCheck" -eq 0 ]; then # Add sudo to docker network_alias="sudo" fi @@ -133,7 +133,7 @@ installKeploy (){ check_sudo sudoCheck=$? network_alias="" - if [ "$sudoCheck" -eq 0 ] && [ $OS_NAME = "Darwin" ]; then + if [ "$sudoCheck" -eq 0 ]; then # Add sudo to docker network_alias="sudo" fi