Repository: metamodel-membrane Updated Branches: refs/heads/master bb7a124e5 -> 40d0564f1
Made docker build orchestrate everything (for DockerHub driven builds) Project: http://git-wip-us.apache.org/repos/asf/metamodel-membrane/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel-membrane/commit/83a7e6f6 Tree: http://git-wip-us.apache.org/repos/asf/metamodel-membrane/tree/83a7e6f6 Diff: http://git-wip-us.apache.org/repos/asf/metamodel-membrane/diff/83a7e6f6 Branch: refs/heads/master Commit: 83a7e6f68320191f13a5b97cbea93ad6d440e6ee Parents: bb7a124 Author: Kasper Sørensen <i.am.kasper.soren...@gmail.com> Authored: Sun Aug 20 01:14:16 2017 -0700 Committer: Kasper Sørensen <i.am.kasper.soren...@gmail.com> Committed: Sun Aug 20 01:14:16 2017 -0700 ---------------------------------------------------------------------- .dockerignore | 18 ++++++++++++++++++ Dockerfile | 29 +++++++++++++++++++++++++++++ docker-compose.yml | 17 ++++++++++++++++- undertow/Dockerfile | 26 -------------------------- 4 files changed, 63 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel-membrane/blob/83a7e6f6/.dockerignore ---------------------------------------------------------------------- diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..3eddedc --- /dev/null +++ b/.dockerignore @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +**/target http://git-wip-us.apache.org/repos/asf/metamodel-membrane/blob/83a7e6f6/Dockerfile ---------------------------------------------------------------------- diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..a10b5d8 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,29 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +FROM maven:3.5-jdk-8-alpine + +# Set data directory used for the app's persistence +VOLUME /data +ENV DATA_DIRECTORY=/data + +COPY . /usr/src/app +WORKDIR /usr/src/app + +RUN mvn clean install -Pdockerbuild -DskipTests + +CMD java -server -jar undertow/target/membrane-undertow-server.jar http://git-wip-us.apache.org/repos/asf/metamodel-membrane/blob/83a7e6f6/docker-compose.yml ---------------------------------------------------------------------- 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 @@ services: 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 http://git-wip-us.apache.org/repos/asf/metamodel-membrane/blob/83a7e6f6/undertow/Dockerfile ---------------------------------------------------------------------- diff --git a/undertow/Dockerfile b/undertow/Dockerfile deleted file mode 100644 index 371d24b..0000000 --- a/undertow/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# 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
