work on 172 - development vs. master

dickschoeller · Feb 3, 2017 · 77e9601 · 77e9601
1 parent 91e6c4b
commit 77e9601
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,8 +19,8 @@ jdk:
 script:
   - docker ps --all
   - mvn --batch-mode install jacoco:report coveralls:report -Dspring.data.mongodb.port=28001 -Dgeoservice.keyfile=stub -Dgeoservice.backupfile=/home/travis/gedbrowser/geoservice-test-backup.json -Dgedbrowser.home=/home/travis/gedbrowser
-  - docker run --link mongo:mongo -v /home/travis/gedbrowser:/var/lib/gedbrowser -p 8086:8080 -p 8087:8080 --name geoservice -d schoellerfamily/geoservice
-  - docker run --link mongo:mongo -v /home/travis/gedbrowser:/var/lib/gedbrowser -p 8080:8080 -p 8081:8081 --name gedbrowser -d schoellerfamily/gedbrowser
+  - docker run --link mongo:mongo -v /home/travis/gedbrowser:/var/lib/gedbrowser -p 8086:8080 -p 8087:8080 --name geoservice -d schoellerfamily/geoservice:snapshot
+  - docker run --link mongo:mongo -v /home/travis/gedbrowser:/var/lib/gedbrowser -p 8080:8080 -p 8081:8081 --name gedbrowser -d schoellerfamily/gedbrowser:snapshot
   - sleep 1m
   - docker images
   - docker ps --all
diff --git a/gedbrowser/pom.xml b/gedbrowser/pom.xml
@@ -35,7 +35,6 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <start-class>org.schoellerfamily.gedbrowser.Application</start-class>
-    <docker.image.prefix>schoellerfamily</docker.image.prefix>
     <config-dir>${project.parent.basedir}/config</config-dir>
   </properties>
 
@@ -250,7 +249,7 @@
               <goal>build</goal>
             </goals>
             <configuration>
-              <imageName>${docker.image.prefix}/${project.artifactId}</imageName>
+              <imageName>${docker.image.prefix}/${project.artifactId}:${docker.image.tag}</imageName>
               <dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
               <skipDockerBuild>false</skipDockerBuild>
               <resources>

diff --git a/geoservice/pom.xml b/geoservice/pom.xml
@@ -35,7 +35,6 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <start-class>org.schoellerfamily.gedbrowser.Application</start-class>
-    <docker.image.prefix>schoellerfamily</docker.image.prefix>
     <config-dir>${project.parent.basedir}/config</config-dir>
   </properties>
 
@@ -156,7 +155,7 @@
               <goal>build</goal>
             </goals>
             <configuration>
-              <imageName>${docker.image.prefix}/${project.artifactId}</imageName>
+              <imageName>${docker.image.prefix}/${project.artifactId}:${docker.image.tag}</imageName>
               <dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
               <skipDockerBuild>false</skipDockerBuild>
               <resources>

diff --git a/pom.xml b/pom.xml
@@ -46,6 +46,9 @@
   </developers>
 
   <properties>
+    <docker.image.prefix>schoellerfamily</docker.image.prefix>
+    <docker.image.tag>snapshot</docker.image.tag>
+
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>