From 190bee55d8a40ecf0ded4578cd6b27c5289c4ef9 Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Tue, 9 Aug 2016 14:20:17 -0400 Subject: [PATCH] docker: move the test part in another Dockerfile Signed-off-by: Jean Privat --- misc/docker/full/Dockerfile | 11 ----------- misc/docker/tests/Dockerfile | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 misc/docker/tests/Dockerfile diff --git a/misc/docker/full/Dockerfile b/misc/docker/full/Dockerfile index fe6fa82..2efb5d3 100644 --- a/misc/docker/full/Dockerfile +++ b/misc/docker/full/Dockerfile @@ -57,17 +57,6 @@ RUN mkdir -p /opt \ && printf "PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_NDK\nexport PATH\n" >> "/etc/profile.d/android.sh" # Setup environment variables - ENV ANDROID_HOME /opt/android-sdk-linux ENV ANDROID_NDK /opt/android-ndk ENV PATH $PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_NDK - -# Run tests -RUN cd /nit/tests \ - # Basic tests - && ./testfull.sh || true \ - && rm -rf out/ alt/*.nit \ - # Nitunits - && ../bin/nitunit ../lib ../contrib || true \ - && rm -rf .nitunit \ - && ccache -C diff --git a/misc/docker/tests/Dockerfile b/misc/docker/tests/Dockerfile new file mode 100644 index 0000000..26a2406 --- /dev/null +++ b/misc/docker/tests/Dockerfile @@ -0,0 +1,15 @@ +# 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:full +MAINTAINER Jean Privat + +# Run tests +RUN cd /nit/tests \ + # Basic tests + && ./testfull.sh || true \ + && rm -rf out/ alt/*.nit \ + # Nitunits + && ../bin/nitunit ../lib ../contrib || true \ + && rm -rf .nitunit \ + && ccache -C -- 1.7.9.5