docker: split into a basic and a full Docker

Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/misc/docker/Dockerfile b/misc/docker/Dockerfile
index 655005d..d7a3f49 100644 (file)
--- a/misc/docker/Dockerfile
+++ b/misc/docker/Dockerfile
@@ -1,5 +1,4 @@
-# This is a full install of Nit on a debian base.
-# Full because most dependencies are installed so that most tests can be run
+# This is a basic install of Nit on a debian base.
 
 FROM debian:jessie
 MAINTAINER Jean Privat <jean@pryen.org>
@@ -30,37 +29,3 @@ RUN git clone https://github.com/nitlang/nit.git /root/nit \
        && strip c_src/nitc bin/nit* \
        && ccache -C \
        && rm -rf .git
-
-# Dependencies for more libs and tests
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-               # Packages needed for lib/
-               libcurl4-openssl-dev \
-               libegl1-mesa-dev \
-               libevent-dev \
-               libgles1-mesa-dev \
-               libgles2-mesa-dev \
-               libgtk-3-dev \
-               libncurses5-dev \
-               libsdl-image1.2-dev \
-               libsdl-ttf2.0-dev \
-               libsdl1.2-dev \
-               libsdl2-dev \
-               libsqlite3-dev \
-               libx11-dev \
-               libxdg-basedir-dev \
-               # Packages needed for platforms and FFI
-               default-jdk \
-               libopenmpi-dev \
-               clang \
-               # TODO neo4j android emscripten test_glsl_validation
-       && rm -rf /var/lib/apt/lists/*
-
-# Run tests
-RUN cd /root/nit/tests \
-       && ./testfull.sh || true \
-       && rm -rf out/ alt/*.nit \
-       && ccache -C
-# TODO: nitunits
-
-WORKDIR /root/nit
-ENTRYPOINT [ "bash" ]

diff --git a/misc/docker/full/Dockerfile b/misc/docker/full/Dockerfile
new file mode 100644 (file)
index 0000000..9e9322d
--- /dev/null
+++ b/misc/docker/full/Dockerfile
@@ -0,0 +1,39 @@
+# This is a full install of Nit on a debian base.
+# Full because most dependencies are installed so that most tests can be run
+
+FROM nitlang/nit:latest
+MAINTAINER Jean Privat <jean@pryen.org>
+
+# Dependencies for more libs and tests
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+               # Packages needed for lib/
+               libcurl4-openssl-dev \
+               libegl1-mesa-dev \
+               libevent-dev \
+               libgles1-mesa-dev \
+               libgles2-mesa-dev \
+               libgtk-3-dev \
+               libncurses5-dev \
+               libsdl-image1.2-dev \
+               libsdl-ttf2.0-dev \
+               libsdl1.2-dev \
+               libsdl2-dev \
+               libsqlite3-dev \
+               libx11-dev \
+               libxdg-basedir-dev \
+               # Packages needed for platforms and FFI
+               default-jdk \
+               libopenmpi-dev \
+               clang \
+               # TODO neo4j android emscripten test_glsl_validation
+       && rm -rf /var/lib/apt/lists/*
+
+# Run tests
+RUN cd /root/nit/tests \
+       && ./testfull.sh || true \
+       && rm -rf out/ alt/*.nit \
+       && ccache -C
+# TODO: nitunits
+
+WORKDIR /root/nit
+ENTRYPOINT [ "bash" ]