From ddbeb9fb55d0edac0f820b174a188aad280a457c Mon Sep 17 00:00:00 2001
From: Mirco Nasuti <mirco.nasuti@chuv.ch>
Date: Tue, 5 Jul 2016 14:01:01 +0200
Subject: [PATCH] a few improvments on the docker side
---
build.sh | 1 +
docker-compose.yml | 17 ++++++++++-------
docker-compose_build.yml | 19 +++++++++++--------
log.sh | 3 +++
pom.xml | 2 +-
src/docker/run/Dockerfile | 4 ++--
6 files changed, 28 insertions(+), 18 deletions(-)
create mode 100755 log.sh
diff --git a/build.sh b/build.sh
index 292ceb9e0..943044203 100755
--- a/build.sh
+++ b/build.sh
@@ -1,4 +1,5 @@
#!/usr/bin/env bash
+./halt.sh
docker-compose -f ./docker-compose_build.yml build
docker-compose -f ./docker-compose_build.yml up
diff --git a/docker-compose.yml b/docker-compose.yml
index 96ef24184..3902ae28d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,10 @@
-backend:
- container_name: backend
- build: ./src/docker/run/
- volumes:
- - ./target:/opt/portal/target
- ports:
- - "8080:8080"
+version: '2'
+
+services:
+ backend:
+ container_name: backend
+ build:
+ context: .
+ dockerfile: ./src/docker/run/Dockerfile
+ ports:
+ - "8080:8080"
diff --git a/docker-compose_build.yml b/docker-compose_build.yml
index c30b2f11e..b29bf59ec 100644
--- a/docker-compose_build.yml
+++ b/docker-compose_build.yml
@@ -1,8 +1,11 @@
-backend_build:
- container_name: backend_build
- build: ./src/docker/build/
- volumes:
- - ./:/opt/portal/
- - .m2:/root/.m2/
- ports:
- - "8080:8080"
+version: '2'
+
+services:
+ backend_build:
+ container_name: backend_build
+ build: ./src/docker/build/
+ volumes:
+ - ./:/opt/portal/
+ - .m2:/root/.m2/
+ ports:
+ - "8080:8080"
diff --git a/log.sh b/log.sh
new file mode 100755
index 000000000..f1cd4924d
--- /dev/null
+++ b/log.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+docker-compose logs -f backend
diff --git a/pom.xml b/pom.xml
index a9cb39f28..f568cd012 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<groupId>org.hbp.mip</groupId>
<artifactId>backend-services</artifactId>
- <version>0.1.0</version>
+ <version>DOCKER_BUILD</version>
<packaging>jar</packaging>
<name>backend-services</name>
diff --git a/src/docker/run/Dockerfile b/src/docker/run/Dockerfile
index e709d55fe..61e0c7ee2 100644
--- a/src/docker/run/Dockerfile
+++ b/src/docker/run/Dockerfile
@@ -1,4 +1,4 @@
FROM frolvlad/alpine-oraclejdk8:slim
-WORKDIR /opt/portal/target
-CMD ["java", "-jar", "backend-services-0.1.0.jar"]
+COPY ./target/backend-services-DOCKER_BUILD.jar backend.jar
+CMD ["java", "-jar", "backend.jar"]
--
GitLab