From bcc0e550538041cc6b348881ad51e198c09bbe4d Mon Sep 17 00:00:00 2001
From: Yoann Vernageau <y.vernageau@gmail.com>
Date: Wed, 28 Jun 2017 16:20:32 +0200
Subject: [PATCH] update `Dockerfile`

---
 .gitignore                                    |  1 +
 Dockerfile                                    | 23 +++++++++++--------
 .../.gitignore                                |  1 +
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 94fc9d22d..916b4965c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,6 +64,7 @@
 **/.idea/
 **/*.iml
 **/*.iws
+**/*.eml
 
 ### NetBeans
 
diff --git a/Dockerfile b/Dockerfile
index 665dcd09f..e9b510748 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,15 +13,17 @@
 # USAGE:
 #
 # docker build -t neoemf .
-# docker run -it neoemf /bin/bash
-# java -jar benchmarks.jar [options]
+# docker run -v {LOCAL_DIR}:/root/ws neoemf [parameters] init
+# docker run -v {LOCAL_DIR}:/root/ws neoemf [parameters] [options]
 #
 
 FROM debian:latest
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV DEBCONF_TERSE true
-ENV WS src
+
+# The default base directory for storing models
+ENV NEOEMF_HOME /root/ws
 
 WORKDIR /root
 
@@ -38,7 +40,7 @@ RUN apt-get update -qq \
  && echo 'oracle-java8-installer shared/accepted-oracle-license-v1-1 select true' | /usr/bin/debconf-set-selections \
 
 # Install JDK8 & build tool
- && apt-get install -q --no-install-recommends -y \
+ && apt-get install -q --no-install-recommends -y --allow-unauthenticated \
     oracle-java8-installer \
     oracle-java8-set-default \
     maven \
@@ -47,16 +49,19 @@ RUN apt-get update -qq \
  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Copy the project
-ADD . $WS
+ADD . src
 
 # Build the main project
-RUN mvn -B install -DskipTests -Dmaven.javadoc.skip=true -f $WS/pom.xml
+RUN mvn -B install -DskipTests -Dmaven.javadoc.skip=true -f src/pom.xml
 
 # Build benchmarks
-RUN mvn -B package -DskipTests -Dmaven.javadoc.skip=true -f $WS/benchmarks/pom.xml
+RUN mvn -B package -DskipTests -Dmaven.javadoc.skip=true -f src/benchmarks/pom.xml
 
 # Move the resulting artifacts
-RUN mv -f $WS/benchmarks/core/target/exec/* . \
+RUN mv -f src/benchmarks/core/target/exec/* . \
 
 # Remove build files
- && rm -rf $WS .m2 /tmp/* /var/tmp/*
+ && rm -rf src .m2 /tmp/* /var/tmp/*
+
+CMD ["-help"]
+ENTRYPOINT ["java", "-jar", "benchmarks.jar"]
\ No newline at end of file
diff --git a/examples/fr.inria.atlanmod.neoemf.tutorial/.gitignore b/examples/fr.inria.atlanmod.neoemf.tutorial/.gitignore
index e046f6cad..9a1379067 100644
--- a/examples/fr.inria.atlanmod.neoemf.tutorial/.gitignore
+++ b/examples/fr.inria.atlanmod.neoemf.tutorial/.gitignore
@@ -1 +1,2 @@
 database/*
+databases/*