From 65afbde7419808f900f3e53e26aa5777ab027224 Mon Sep 17 00:00:00 2001
From: David Seus <david.seus@mathematik.uni-stuttgart.de>
Date: Wed, 10 Oct 2018 17:07:13 +0200
Subject: [PATCH] update README
---
README.md | 5 -----
1 file changed, 5 deletions(-)
diff --git a/README.md b/README.md
index 6454ec2..f4afed3 100644
--- a/README.md
+++ b/README.md
@@ -7,13 +7,8 @@ Pull the latest fenics Docker image
## Create docker container named LDD-TPR with graphical display, share folder `pwd`:
-<<<<<<< HEAD
docker run --dns=129.69.252.252 -it --env HOST_UID=$(id -u $USER) --env HOST_GID=$(id -g $USER) --env DISPLAY=unix$DISPLAY --device /dev/dri --volume /tmp/.X11-unix:/tmp/.X11-unix:rw --volume $(pwd):/home/fenics/shared --name LDD-TPR quay.io/fenicsproject/stable:latest /bin/bash
-=======
-```
- docker run --dns=129.69.252.252 -it --env HOST_UID=$(id -u $USER) --env HOST_GID=$(id -g $USER) --env DISPLAY=unix$DISPLAY --device /dev/dri --volume /tmp/.X11-unix:/tmp/.X11-unix:rw --volume $(pwd):/home/fenics/shared --name LDD-TPR quay.io/fenicsproject/stable:latest /bin/bash
->>>>>>> d18f25ea72f612e4356bfa446899dfa0b6be7017
If you want the container do be automatically deleted after exiting add `--rm` option.
--
GitLab