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.

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

Adds docker desktop option in setup.sh #353

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,16 @@ DOCKER_PID_FILE=/var/run/docker.pid
if [ -f "$DOCKER_PID_FILE" ]; then
echo -e "Docker is running."
else
echo -e '\e[31mDocker daemon is not running'
echo -e '\e[31mAborting...'
echo -e "\e[31mPlease start docker daemon and restart again"
exit
# for Docker desktop users
DOCKER_PID_FILE=/var/run/docker-desktop-proxy.pid
if [ -f "$DOCKER_PID_FILE" ]; then
echo -e "Docker is running."
Comment on lines +51 to +53
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of writing another condition, check for the existence of both files in one if statement.

else
echo -e '\e[31mDocker daemon is not running'
echo -e '\e[31mAborting...'
echo -e "\e[31mPlease start docker daemon and restart again"
exit
fi
fi

echo -e "Installing air for live reloading"
Expand Down