From 0b25bc3967d88ad967cb4ea683bb83531a610d6d Mon Sep 17 00:00:00 2001
From: Ludovic Claude <ludovic.claude54@gmail.com>
Date: Wed, 24 Feb 2016 12:38:44 +0100
Subject: [PATCH] run runs, build builds

---
 build.sh                    | 11 +++--------
 run.sh                      | 13 ++++++++++++-
 src/docker/build/.gitignore |  1 +
 src/docker/build/Dockerfile |  1 +
 4 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 src/docker/build/.gitignore

diff --git a/build.sh b/build.sh
index b39a2ed28..751216159 100755
--- a/build.sh
+++ b/build.sh
@@ -1,16 +1,11 @@
 #!/bin/bash -e
+
 if groups $USER | grep &>/dev/null '\bdocker\b'; then
   DOCKER_COMPOSE="docker-compose"
 else
   DOCKER_COMPOSE="sudo docker-compose"
 fi
 
-# Create a symlink to the local Maven repository
-[ -L .m2 ] || ln -s -t . ~/.m2
-
-$DOCKER_COMPOSE --file=docker-compose.init.yml --project-name=portal-backend-init up
-
-echo "Need to set the current user as owner of the files generated in target directory..."
-sudo chown -R $USER:$USER ./target
+cp target/mip.jar src/docker/build/
 
-echo "Done"
+$DOCKER_COMPOSE build
diff --git a/run.sh b/run.sh
index 13c4f109a..3483bbcfc 100755
--- a/run.sh
+++ b/run.sh
@@ -1,9 +1,20 @@
 #!/bin/bash -e
 
+# Run the backend in a Docker container and start the database.
+# The current project is compiler inside the Docker container
+
 if groups $USER | grep &>/dev/null '\bdocker\b'; then
   DOCKER_COMPOSE="docker-compose"
 else
   DOCKER_COMPOSE="sudo docker-compose"
 fi
 
-$DOCKER_COMPOSE up
+# Create a symlink to the local Maven repository
+[ -L .m2 ] || ln -s -t . ~/.m2
+
+$DOCKER_COMPOSE --file=docker-compose.init.yml --project-name=portal-backend-init up
+
+echo "Need to set the current user as owner of the files generated in target directory..."
+sudo chown -R $USER:$USER ./target
+
+echo "Done"
diff --git a/src/docker/build/.gitignore b/src/docker/build/.gitignore
new file mode 100644
index 000000000..d392f0e82
--- /dev/null
+++ b/src/docker/build/.gitignore
@@ -0,0 +1 @@
+*.jar
diff --git a/src/docker/build/Dockerfile b/src/docker/build/Dockerfile
index c2a4425b1..1369edf76 100644
--- a/src/docker/build/Dockerfile
+++ b/src/docker/build/Dockerfile
@@ -7,6 +7,7 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/v0.2.0/dockerize
 RUN tar -C /usr/local/bin -xzvf dockerize-linux-amd64-v0.2.0.tar.gz
 
 COPY mip.sh /opt/portal/
+COPY mip.jar /opt/portal/lib/
 RUN chmod +x /opt/portal/mip.sh
 EXPOSE 8080
 
-- 
GitLab