Various changes

netbrain · netbrain · commit fd1e4fa5c40d · 2015-11-28T23:05:58.000+01:00
diff --git a/base-dev/Dockerfile b/base-dev/Dockerfile
@@ -0,0 +1,7 @@
+FROM netbrain/base-user
+
+#DEV ENV
+ENV TOOLS_PATH $HOME/tools
+ENV DEV_PATH $HOME/dev
+
+RUN mkdir -p $TOOLS_PATH $DEV_PATH $HOME/bin
diff --git a/base-user/Dockerfile b/base-user/Dockerfile
@@ -15,10 +15,4 @@ USER docker
 
 #USER ENV
 ENV HOME /home/docker
-ENV TOOLS_PATH $HOME/tools
-ENV DEV_PATH $HOME/dev
-#ENV LANG en_US.UTF-8
-#ENV LC_ALL en_US.UTF-8
-
-RUN mkdir -p $TOOLS_PATH $DEV_PATH $HOME/bin
-WORKDIR $TOOLS_PATH
+WORKDIR $HOME
diff --git a/go/Dockerfile b/go/Dockerfile
@@ -1,4 +1,4 @@
-FROM netbrain/base-user
+FROM netbrain/base-dev
 
 RUN sudo apt-get -y install libncurses5-dev python-dev \
     ruby-dev git python2.7 build-essential libncurses5-dev
diff --git a/keepers b/keepers
@@ -1 +1,6 @@
+xhost +local:`docker inspect --format='{{ .Config.Hostname }}' $containerId`
+
+
+docker run --privileged -v /dev/dri:/dev/dri -v /usr/share/fonts:/usr/share/fonts -v /dev:/dev --rm -it netbrain/xorg
+
 docker run -v /tmp/.X11-unix:/tmp/.X11-unix -e DPLAY=unix$DISPLAY --link friport_db_1:db -it tianon/robomongo
diff --git a/vim-base/Dockerfile b/vim-base/Dockerfile
@@ -1,4 +1,4 @@
-FROM netbrain/base-user
+FROM netbrain/base-dev
 
 ENV VIM_HOME=$TOOLS_PATH/vim
 
diff --git a/xorg/10-input.conf b/xorg/10-input.conf
@@ -0,0 +1,23 @@
+Section "ServerFlags"
+         Option "AutoAddDevices" "False"
+ EndSection
+
+ Section "ServerLayout"
+     Identifier     "Desktop"
+     InputDevice    "Mouse0" "CorePointer"
+     InputDevice    "Keyboard0" "CoreKeyboard"
+ EndSection
+
+ Section "InputDevice"
+     Identifier "Keyboard0"
+     Driver "kbd"
+     Option "Device" "/dev/input/event0"
+ EndSection
+
+ Section "InputDevice"
+     Identifier "Mouse0"
+     Driver "mouse"
+     Option "Protocol" "auto"
+     Option "Device" "/dev/input/mice"
+     Option "ZAxisMapping" "4 5 6 7"
+ EndSection
diff --git a/xorg/Dockerfile b/xorg/Dockerfile
@@ -0,0 +1,13 @@
+FROM debian:jessie
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update
+RUN apt-get -y install xorg i3 xserver-xorg-input-kbd 
+#RUN apt-get -y install xserver-xorg-core 
+#RUN bash -c "apt-get -y install xserver-xorg-video-{intel,modesetting,fbdev,vesa}"
+
+ADD 10-input.conf /etc/X11/xorg.conf.d/
+
+ENTRYPOINT bash
+#docker run --rm --name xorg -it --group-add audio --group-add video --group-add plugdev --device /dev/tty10 --device /dev/input/mice --device /dev/input --device /dev/dri  netbrain/xorg

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM netbrain/base-user`
	`1`	`+FROM netbrain/base-dev`
`2`	`2`
`3`	`3`	`RUN sudo apt-get -y install libncurses5-dev python-dev \`
`4`	`4`	`ruby-dev git python2.7 build-essential libncurses5-dev`