Commit 99ca333e authored by Sergey Gorbunov's avatar Sergey Gorbunov
Browse files

update for mac OsX

parent 344ce3a0
......@@ -4,18 +4,23 @@ Instructions:
https://www.docker.com/get-started
== Install X11 ==
For Mac OsX:
1. install XQuartz
2. in XQuartz Setting / Security allow connections from network clients (see X11Settings.png)
(Einstellungen / Sicherheit/ Verbindungen von Netzwerk-Clients erlauben)
== Run cbmdockInit.sh script ==
./cbmdockInit.sh
== Re-login, or type
source ~/.baschrc
== Run cbmdock alias. It opens a shell in the container with an actual DISPLAY value ==
== Run a shell in the container with an actual DISPLAY value ==
( This command you run each time you want to enter the container. To exit, type "exit". )
( This command you call each time you want to enter the container. To exit, type "exit". )
cbmdock
......
......@@ -36,7 +36,13 @@ docker exec -t --user root ${ContainerName} bash -c "\
# create cbmdock alias on the host. It runs a shell in the container with an actual DISPLAY value
if[[ `alias | grep -q cbmdock`]]
then
if [[ `uname -s` -eq Darwin ]]
then
echo MacOSX detected
echo "alias cbmdock='docker start "${ContainerName}"; docker exec -ti -e DISPLAY=host.docker.internal:0 "${ContainerName}" bash'" >> ~/.bashrc
else
echo "alias cbmdock='docker start "${ContainerName}"; docker exec -ti -e DISPLAY=\$DISPLAY "${ContainerName}" bash'" >> ~/.bashrc
fi
fi
source ~/.bashrc
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment