From 723584f7f35972fb0064d03aedb6e5e04f1732aa Mon Sep 17 00:00:00 2001
From: Mirco Nasuti <mirco.nasuti@chuv.ch>
Date: Tue, 5 Jul 2016 12:21:06 +0200
Subject: [PATCH] separate build and run with docker
---
Dockerfile | 14 ------------
build.sh | 15 +++----------
docker-compose.init.yml | 21 ------------------
docker-compose.yml | 21 ++++--------------
docker-compose_build.yml | 8 +++++++
halt.sh | 4 ++++
run.sh | 22 +++----------------
src/docker/build/.gitignore | 1 -
src/docker/build/Dockerfile | 17 +++-----------
src/docker/build/build-in-docker.sh | 4 ++++
src/docker/build/mip.sh | 3 ---
src/docker/init/build-in-docker.sh | 8 -------
src/docker/run/Dockerfile | 4 ++++
...ustomLoginUrlAuthenticationEntryPoint.java | 21 ++++++++++++++++++
start.bat | 1 -
stop.sh | 8 -------
16 files changed, 54 insertions(+), 118 deletions(-)
delete mode 100644 Dockerfile
delete mode 100644 docker-compose.init.yml
create mode 100644 docker-compose_build.yml
create mode 100755 halt.sh
delete mode 100644 src/docker/build/.gitignore
create mode 100644 src/docker/build/build-in-docker.sh
delete mode 100644 src/docker/build/mip.sh
delete mode 100644 src/docker/init/build-in-docker.sh
create mode 100644 src/docker/run/Dockerfile
create mode 100644 src/main/java/org/hbp/mip/utils/CustomLoginUrlAuthenticationEntryPoint.java
delete mode 100644 start.bat
delete mode 100755 stop.sh
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 1d24297ed..000000000
--- a/Dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-# This Dockerfile encapsulate the MIP portal backend application for development purposes.
-# We use it to bootstrap the generation of the Hibernate mapping file and the application jar.
-
-FROM maven:3-jdk-8
-
-COPY ./src/docker/init/build-in-docker.sh /build-in-docker.sh
-
-CMD mkdir /opt/portal/
-
-VOLUME /opt/portal/
-
-WORKDIR /opt/portal/
-
-CMD ["/build-in-docker.sh"]
diff --git a/build.sh b/build.sh
index 748d7fb5c..292ceb9e0 100755
--- a/build.sh
+++ b/build.sh
@@ -1,13 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
-if groups $USER | grep &>/dev/null '\bdocker\b'; then
- DOCKER_COMPOSE="docker-compose"
-else
- DOCKER_COMPOSE="sudo docker-compose"
-fi
-
-# TODO: Cannot clean otherwise the build fails because of Hibernate schema generation
-mvn package
-cp target/mip.jar src/docker/build/
-
-$DOCKER_COMPOSE build
+docker-compose -f ./docker-compose_build.yml build
+docker-compose -f ./docker-compose_build.yml up
diff --git a/docker-compose.init.yml b/docker-compose.init.yml
deleted file mode 100644
index e5828d70b..000000000
--- a/docker-compose.init.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-# Build the application and regenerate the Hibernate mapping
-
-portaldb:
- image: postgres:9.5.3
- container_name: portaldb
- ports:
- - "55432:5432"
- volumes:
- - ./src/test/db/sql:/docker-entrypoint-initdb.d/
- environment:
- POSTGRES_PASSWORD: test
-
-portal-backend:
- build: .
- volumes:
- - ./:/portal/
- - ./.m2/:/root/.m2/
- links:
- - portaldb
- ports:
- - "8080:8080"
diff --git a/docker-compose.yml b/docker-compose.yml
index ad6a91c77..96ef24184 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,20 +1,7 @@
-
-portaldb:
- image: postgres:9.5.3
- container_name: portaldb
- ports:
- - "55432:5432"
- volumes:
- - ./src/test/db/sql:/docker-entrypoint-initdb.d/
- environment:
- POSTGRES_PASSWORD: test
-
-portal-backend:
- build: ./src/docker/build
+backend:
+ container_name: backend
+ build: ./src/docker/run/
volumes:
- - ./src/test/docker/:/opt/portal/config/
- - ./target/:/opt/portal/lib/
- links:
- - portaldb
+ - ./target:/opt/portal/target
ports:
- "8080:8080"
diff --git a/docker-compose_build.yml b/docker-compose_build.yml
new file mode 100644
index 000000000..c30b2f11e
--- /dev/null
+++ b/docker-compose_build.yml
@@ -0,0 +1,8 @@
+backend_build:
+ container_name: backend_build
+ build: ./src/docker/build/
+ volumes:
+ - ./:/opt/portal/
+ - .m2:/root/.m2/
+ ports:
+ - "8080:8080"
diff --git a/halt.sh b/halt.sh
new file mode 100755
index 000000000..7b9c9e76a
--- /dev/null
+++ b/halt.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+docker-compose kill
+docker-compose rm -f
diff --git a/run.sh b/run.sh
index 3483bbcfc..4dc85dc16 100755
--- a/run.sh
+++ b/run.sh
@@ -1,20 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
-# 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
-
-# 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"
+docker-compose build
+docker-compose up -d
diff --git a/src/docker/build/.gitignore b/src/docker/build/.gitignore
deleted file mode 100644
index d392f0e82..000000000
--- a/src/docker/build/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.jar
diff --git a/src/docker/build/Dockerfile b/src/docker/build/Dockerfile
index 1369edf76..b4318d788 100644
--- a/src/docker/build/Dockerfile
+++ b/src/docker/build/Dockerfile
@@ -1,19 +1,8 @@
-# This Dockerfile encapsulate the MIP portal backend application for development purposes.
-
FROM maven:3-jdk-8
-RUN apt-get update && apt-get install -y wget
-RUN wget https://github.com/jwilder/dockerize/releases/download/v0.2.0/dockerize-linux-amd64-v0.2.0.tar.gz
-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
-
-VOLUME /opt/portal/config/
-VOLUME /opt/portal/lib/
+COPY ./build-in-docker.sh /build-in-docker.sh
+VOLUME /opt/portal/
WORKDIR /opt/portal/
-CMD ["/usr/local/bin/dockerize", "-timeout", "240s", "-wait", "tcp://portaldb:5432", "/opt/portal/mip.sh"]
+CMD ["bash", "/build-in-docker.sh"]
diff --git a/src/docker/build/build-in-docker.sh b/src/docker/build/build-in-docker.sh
new file mode 100644
index 000000000..604669be4
--- /dev/null
+++ b/src/docker/build/build-in-docker.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+rm -r target/
+mvn package -DskipTests -P dev
diff --git a/src/docker/build/mip.sh b/src/docker/build/mip.sh
deleted file mode 100644
index cfae68474..000000000
--- a/src/docker/build/mip.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-/usr/bin/java -DconfigFile=/opt/portal/config/application.yml -jar /opt/portal/lib/mip.jar
diff --git a/src/docker/init/build-in-docker.sh b/src/docker/init/build-in-docker.sh
deleted file mode 100644
index aff4c2e6c..000000000
--- a/src/docker/init/build-in-docker.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-echo ">>> Building inside Docker"
-cd /portal
-
-mvn package
-
-echo ">>> Press Ctrl+C to stop, build is complete"
diff --git a/src/docker/run/Dockerfile b/src/docker/run/Dockerfile
new file mode 100644
index 000000000..e709d55fe
--- /dev/null
+++ b/src/docker/run/Dockerfile
@@ -0,0 +1,4 @@
+FROM frolvlad/alpine-oraclejdk8:slim
+
+WORKDIR /opt/portal/target
+CMD ["java", "-jar", "backend-services-0.1.0.jar"]
diff --git a/src/main/java/org/hbp/mip/utils/CustomLoginUrlAuthenticationEntryPoint.java b/src/main/java/org/hbp/mip/utils/CustomLoginUrlAuthenticationEntryPoint.java
new file mode 100644
index 000000000..437052aa8
--- /dev/null
+++ b/src/main/java/org/hbp/mip/utils/CustomLoginUrlAuthenticationEntryPoint.java
@@ -0,0 +1,21 @@
+package org.hbp.mip.utils;
+
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class CustomLoginUrlAuthenticationEntryPoint extends LoginUrlAuthenticationEntryPoint {
+
+ public CustomLoginUrlAuthenticationEntryPoint(String url) {
+ super(url);
+ }
+
+ @Override
+ public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException, ServletException {
+ response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
+ }
+}
diff --git a/start.bat b/start.bat
deleted file mode 100644
index af12a1b52..000000000
--- a/start.bat
+++ /dev/null
@@ -1 +0,0 @@
-start java -jar target\backend-services-0.0.1-SNAPSHOT.jar --spring.config.location=config\application.yml
\ No newline at end of file
diff --git a/stop.sh b/stop.sh
deleted file mode 100755
index 3bc6146ac..000000000
--- a/stop.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-if groups $USER | grep &>/dev/null '\bdocker\b'; then
- DOCKER_COMPOSE="docker-compose"
-else
- DOCKER_COMPOSE="sudo docker-compose"
-fi
-
-$DOCKER_COMPOSE rm -f
--
GitLab