Merge pull request #1 from jmMeessen/xserver

MaJ projet avec X2Go et debian:wheezy sur devbox

Author: jmMeessen

.gitattributes

@@ -0,0 +1,2 @@
+# Force checkout as Unix endline style
+text eol=lf

.gitignore

@@ -0,0 +1,2 @@
+.vagrant
+.DS_Store

TODO.md

@@ -0,0 +1,14 @@
+# Todo ?
+
+* Maven Install [JMM]
+* Sudoes no passwd
+* Data volume à appliquer (/data, /tmp, logs, etc.) pour perfs I/O
+
+* Script shell de lancement de la devbox (avec partage docker socket + docker bin)
+* Script de "backup" du workspace (docker run --volume-from=devbox debian:wheezy -v /vagrant:/backup tar czf /data /backup/$(date).tgz ou truc du genre) 
+
+* XFCE : "default config" to panel
+* XFCE raccourcis pour IntelliJ
+* Icones XFCE ?
+
+* Attention, les ENV du Dockerfile ne sont pas appliqués au user dockerx => /etc/default, profile, etc...

Vagrantfile

@@ -0,0 +1,3 @@
+Vagrant.configure(2) do |config|
+  config.vm.box = "dduportal/boot2docker"
+end

devbox/Dockerfile

@@ -1,30 +1,51 @@
-FROM ubuntu:14.04
+FROM debian:wheezy
+MAINTAINER Damien DUPORTAL <[email protected]>
 MAINTAINER Jean-Marc MEESSEN <[email protected]>
 
-# Pull base image.
+ENV DEBIAN_FRONTEND noninteractive
+ENV IDEA_VERSION=14.1.1
 
+COPY x2go.list /etc/apt/sources.list.d/x2go.list
 
-# Install.
-RUN \
-  sed -i 's/# \(.*multiverse$\)/\1/g' /etc/apt/sources.list && \
-  apt-get update && \
-  apt-get -y upgrade && \
-  apt-get install -y build-essential && \
-  apt-get install -y software-properties-common && \
-  apt-get install -y byobu curl git htop man unzip vim wget && \
-  rm -rf /var/lib/apt/lists/*
-
-# Install Java.
-RUN \
-  echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections && \
-  add-apt-repository -y ppa:webupd8team/java && \
-  apt-get update && \
-  apt-get install -y oracle-java7-installer && \
-  rm -rf /var/lib/apt/lists/* && \
-  rm -rf /var/cache/oracle-jdk7-installer
+RUN apt-key adv --recv-keys --keyserver keys.gnupg.net E1F958385BFE2B6E \
+  && apt-get update \
+  && apt-get install -y --no-install-recommends \
+    aptitude \
+    byobu \
+    build-essential \
+    curl \
+    htop \
+    openjdk-7-jdk \
+    openssh-server \
+    software-properties-common \
+    sudo \
+    vim \
+    wget
+RUN apt-get install -y --no-install-recommends \
+    xfce4 \
+    xfce4-goodies \
+    x2goserver \
+    x2goserver-xsession \
+    x2go-keyring \
+  && echo "root:root" | chpasswd \
+  && adduser --disabled-password --gecos "" dockerx \
+  && adduser dockerx sudo \
+  && echo "dockerx:dockerx" | chpasswd \
+  && adduser dockerx x2gouser \
+  && mkdir -p /var/run/sshd && sed -i "s/UsePrivilegeSeparation.*/UsePrivilegeSeparation no/g" /etc/ssh/sshd_config && sed -i "s/UsePAM.*/UsePAM no/g" /etc/ssh/sshd_config \
+  && sed -i "s/PermitRootLogin.*/PermitRootLogin yes/g" /etc/ssh/sshd_config \
+  && sed -i "s/#PasswordAuthentication/PasswordAuthentication/g" /etc/ssh/sshd_config \
+  && chmod 1777 /dev/shm \
+  && rm -rf /var/lib/apt/lists/* /var/cache/* /tmp/*
 
 # Define working directory.
 WORKDIR /data
 
-# Define commonly used JAVA_HOME variable
-ENV JAVA_HOME /usr/lib/jvm/java-7-oracle
+RUN curl -L -o /tmp/idea.tgz https://download.jetbrains.com/idea/ideaIC-${IDEA_VERSION}.tar.gz \
+  && tar -xzf /tmp/idea.tgz -C /opt/ \
+  && mv /opt/idea* /opt/idea \
+  && ln -s /opt/idea/bin/idea.sh /usr/local/bin/
+
+EXPOSE 22
+
+CMD ["/usr/sbin/sshd","-D"]

devbox/x2go.list

@@ -0,0 +1,4 @@
+# X2Go Repository (release builds)
+deb http://packages.x2go.org/debian wheezy main
+# X2Go Repository (sources of release builds)
+deb-src http://packages.x2go.org/debian wheezy main