Made docker build orchestrate everything (for DockerHub driven builds)
diff --git a/undertow/Dockerfile b/.dockerignore
similarity index 79%
rename from undertow/Dockerfile
rename to .dockerignore
index 371d24b..3eddedc 100644
--- a/undertow/Dockerfile
+++ b/.dockerignore
@@ -15,12 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-FROM openjdk:8-jre-alpine
-
-COPY target/membrane-undertow-server.jar membrane-undertow-server.jar
-
-VOLUME /data
-
-ENV DATA_DIRECTORY=/data
-
-CMD java -server -jar membrane-undertow-server.jar
+**/target
diff --git a/undertow/Dockerfile b/Dockerfile
similarity index 77%
copy from undertow/Dockerfile
copy to Dockerfile
index 371d24b..a10b5d8 100644
--- a/undertow/Dockerfile
+++ b/Dockerfile
@@ -15,12 +15,15 @@
# specific language governing permissions and limitations
# under the License.
-FROM openjdk:8-jre-alpine
+FROM maven:3.5-jdk-8-alpine
-COPY target/membrane-undertow-server.jar membrane-undertow-server.jar
-
+# Set data directory used for the app's persistence
VOLUME /data
-
ENV DATA_DIRECTORY=/data
-CMD java -server -jar membrane-undertow-server.jar
+COPY . /usr/src/app
+WORKDIR /usr/src/app
+
+RUN mvn clean install -Pdockerbuild -DskipTests
+
+CMD java -server -jar undertow/target/membrane-undertow-server.jar
diff --git a/docker-compose.yml b/docker-compose.yml
index c87a2bb..96d7d21 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,8 +19,23 @@
metamodel-membrane:
container_name: metamodel-membrane
image: metamodel-membrane
- build: undertow
+ build: .
ports:
- "8080:8080"
environment:
- MEMBRANE_HTTP_PORT=8080
+ example-postgres:
+ container_name: example-postgres
+ image: postgres:9.6
+ environment:
+ - POSTGRES_USER=membrane
+ - POSTGRES_PASSWORD=secret
+ - POSTGRES_DB=membrane
+ example-couchdb:
+ container_name: example-couchdb
+ image: couchdb:1.6
+ environment:
+ - COUCHDB_USER=membrane
+ - COUCHDB_PASSWORD=secret
+ ports:
+ - 5984:5984
