This is an automated email from the ASF dual-hosted git repository.
shuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/unomi.git
The following commit(s) were added to refs/heads/master by this push:
new f882a14 UNOMI-334 Docker - Maven integration - Expose Karaf SSH port
in docker-compose - Strip versions to make sure it works when pulling snapshots
from Maven repository
f882a14 is described below
commit f882a14a0e843f9d5b4d7e6ad47cb4282af7c034
Author: Serge Huber <[email protected]>
AuthorDate: Tue May 5 08:58:09 2020 +0200
UNOMI-334 Docker - Maven integration
- Expose Karaf SSH port in docker-compose
- Strip versions to make sure it works when pulling snapshots from Maven
repository
---
docker/pom.xml | 3 ++-
docker/src/main/docker/Dockerfile | 4 +---
docker/src/main/docker/docker-compose.yml | 1 +
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docker/pom.xml b/docker/pom.xml
index 9267f1e..d92be43 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -48,11 +48,12 @@
<executions>
<execution>
<id>copy</id>
- <phase>package</phase>
+ <phase>process-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
+ <stripVersion>true</stripVersion>
<outputDirectory>${project.build.directory}/filtered-docker</outputDirectory>
<artifactItems>
<artifactItem>
diff --git a/docker/src/main/docker/Dockerfile
b/docker/src/main/docker/Dockerfile
index da18bd7..2d59f6e 100644
--- a/docker/src/main/docker/Dockerfile
+++ b/docker/src/main/docker/Dockerfile
@@ -25,11 +25,9 @@ ENV KARAF_OPTS "-Dunomi.autoStart=true"
ENV UNOMI_ELASTICSEARCH_ADDRESSES=localhost:9200
-ENV UNOMI_VERSION "${project.version}"
-
WORKDIR $UNOMI_HOME
-ADD unomi-${UNOMI_VERSION}.tar.gz ./
+ADD unomi.tar.gz ./
RUN mv unomi-*/* . \
&& rm -rf unomi-*
diff --git a/docker/src/main/docker/docker-compose.yml
b/docker/src/main/docker/docker-compose.yml
index e650d88..58a8f6a 100644
--- a/docker/src/main/docker/docker-compose.yml
+++ b/docker/src/main/docker/docker-compose.yml
@@ -38,6 +38,7 @@ services:
ports:
- 8181:8181
- 9443:9443
+ - 8102:8102
links:
- elasticsearch
depends_on:
