This is an automated email from the ASF dual-hosted git repository.
kaspersor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/metamodel-membrane.git
commit dd53d49dbf1c973ec56f3ff645add3f9c6e5ab53
Author: Kasper Sørensen <i.am.kasper.soren...@gmail.com>
AuthorDate: Tue Jan 15 20:35:39 2019 -0800
Fixed docker build which wasn't working because of .dockerignore
---
.dockerignore | 18 ------------------
docker-compose.yml | 2 +-
Dockerfile => undertow/Dockerfile | 2 +-
3 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/.dockerignore b/.dockerignore
deleted file mode 100644
index 3eddedc..0000000
--- a/.dockerignore
+++ /dev/null
@@ -1,18 +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.
-
-**/target
diff --git a/docker-compose.yml b/docker-compose.yml
index 84ab431..36d9c2b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,7 +19,7 @@ services:
metamodel-membrane:
container_name: metamodel-membrane
image: apache/metamodel-membrane
- build: .
+ build: undertow
ports:
- "8080:8080"
environment:
diff --git a/Dockerfile b/undertow/Dockerfile
similarity index 92%
rename from Dockerfile
rename to undertow/Dockerfile
index 356e721..d368b27 100644
--- a/Dockerfile
+++ b/undertow/Dockerfile
@@ -23,7 +23,7 @@ ENV DATA_DIRECTORY=/data
RUN mkdir /app
-COPY undertow/target/membrane-undertow-server.jar /app
+COPY target/membrane-undertow-server.jar /app/membrane-undertow-server.jar
WORKDIR /app
CMD java -server -jar membrane-undertow-server.jar
