Setting DISPLAY variable for xpra in a way to also allow connecting w…

…ith ssh -X (instead of xpra)
retog · Mar 25, 2016 · 1613397 · 1613397
1 parent 6b80d3f
commit 1613397
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -23,7 +23,8 @@ VOLUME /home/user
 
 ENV DISPLAY=:100
 
-RUN echo DISPLAY=$DISPLAY >> /etc/environment
+ADD xpra-display /tmp/xpra-display
+RUN echo "$(cat /tmp/xpra-display)\n$(cat /etc/bash.bashrc)" > /etc/bash.bashrc 
 
 # Start SSH anx Xpra
 CMD mkdir -p /home/user/.ssh/ && chown -R user:user /home/user \ 

diff --git a/xpra-display b/xpra-display
@@ -0,0 +1,3 @@
+if [ -z "$DISPLAY" ]; then
+    export DISPLAY=:100
+fi