Skip to content

Commit

Permalink
update CLion docker configuration.
Browse files Browse the repository at this point in the history
  • Loading branch information
jcschaff committed Aug 21, 2018
1 parent fdeefb4 commit 768d158
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
8 changes: 4 additions & 4 deletions docker/create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ cd $DIR
image_name="localhost:5000/vcell-solvers-ide:dev"
container_name="vcell-solvers-ide"

docker build -f ./Dockerfile-ide --tag $image_name .
sudo docker build -f ./Dockerfile-ide --tag $image_name .
if [ $(uname) == "Darwin" ]; then
IP=$(ifconfig en0 | grep inet | awk '$1=="inet" {print $2}')
docker create -it --name $container_name -v "$WORKSPACE_DIR:/workspace" -e DISPLAY=$IP:0 $image_name
sudo docker create -it --name $container_name -v "$WORKSPACE_DIR:/workspace" -e DISPLAY=$IP:0 $image_name
elif [ $(uname) == "Linux" ]; then
docker create -it --name $container_name --net=host -v /tmp/.X11-unix -v "$WORKSPACE_DIR:/workspace" -e DISPLAY $image_name
sudo docker create -it --name $container_name --net=host -v /tmp/.X11-unix -v "$WORKSPACE_DIR:/workspace" -e DISPLAY $image_name
fi
docker start $container_name
sudo docker start $container_name

#
# enabling X11 communication between this host and the Docker container:
Expand Down
4 changes: 2 additions & 2 deletions docker/destroy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

container_name="vcell-solvers-ide"

docker stop $container_name
docker rm $container_name
sudo docker stop $container_name
sudo docker rm $container_name

4 changes: 2 additions & 2 deletions docker/run_bash.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ WORKSPACE_DIR="$(cd "$(dirname "$0")"; cd ..; cd ..; pwd)"

container_name="vcell-solvers-ide"

(docker container ls | grep $container_name)>/dev/null
(sudo docker container ls | grep $container_name)>/dev/null
if [[ $? -ne 0 ]]; then
echo "container not created or not running, call ./create.sh first"
exit 1
fi

echo "starting shell in running container '$container_name', type 'exit' to leave"
docker container exec -it $container_name /bin/bash
sudo docker container exec -it $container_name /bin/bash


7 changes: 4 additions & 3 deletions docker/run_clion.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ WORKSPACE_DIR="$(cd "$(dirname "$0")"; cd ..; cd ..; pwd)"

container_name="vcell-solvers-ide"

(docker container ls | grep $container_name)>/dev/null
(sudo docker container ls | grep $container_name)>/dev/null
if [[ $? -ne 0 ]]; then
echo "container not created or not running, call ./create.sh first"
exit 1
Expand All @@ -15,9 +15,10 @@ fi
if [ $(uname) == "Linux" ]; then
echo "adding xauth cookie"
XAUTH_COOKIE=$(xauth list | grep `hostname` | head -1)
docker exec -i $container_name xauth add $XAUTH_COOKIE
echo "sudo docker exec -i $container_name xauth add $XAUTH_COOKIE"
sudo docker exec -i $container_name xauth add $XAUTH_COOKIE
fi

echo "starting clion in running container '$container_name'"
CLION="/usr/local/opt/clion/bin/clion.sh"
docker container exec -i $container_name $CLION
sudo docker container exec -i $container_name $CLION

0 comments on commit 768d158

Please sign in to comment.