Fixes issue eclipse-vorto#1213

Signed-off-by: Fritz Otlinghaus <[email protected]> Fixing docker build
Scriptkiddi · Dec 11, 2018 · 19d37fb · 19d37fb
1 parent d20715a
commit 19d37fb
Show file tree

Hide file tree

Showing 4 changed files with 439 additions and 436 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -33,8 +33,8 @@ script:
   - remark -i .remark_ignore -f -u validate-links .
   - remark -i .remark_ignore -u lint-no-dead-urls .
   - mvn -q clean install -P checkstyle
-  - docker build -f repository/repository-server/Dockerfile -t eclipsevorto/vorto-repo:latest ./repository/repository-server;
-  - docker build -f generators/generator-runner/Dockerfile -t eclipsevorto/vorto-generators:latest ./generators/generator-runner;
+  - docker build --build-arg JAR_FILE=./infomodelrepository.jar -f repository/repository-server/Dockerfile -t eclipsevorto/vorto-repo:latest ./repository/repository-server;
+  - docker build --build-arg JAR_FILE=./generator-runner-exec.jar -f generators/generator-runner/Dockerfile -t eclipsevorto/vorto-generators:latest ./generators/generator-runner;
 
 deploy:
   provider: script

diff --git a/generators/generator-runner/pom.xml b/generators/generator-runner/pom.xml
@@ -130,6 +130,7 @@
 		</dependencies>
 	</dependencyManagement>
 	<build>
+		<finalName>generator-runner</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>

diff --git a/...a/org/eclipse/vorto/model/Dictionary.java → ...g/eclipse/vorto/model/DictionaryType.java b/...a/org/eclipse/vorto/model/Dictionary.java → ...g/eclipse/vorto/model/DictionaryType.java
@@ -12,18 +12,18 @@
  */
 package org.eclipse.vorto.model;
 
-public class Dictionary implements IReferenceType {
+public class DictionaryType implements IReferenceType {
 
   private IReferenceType key;
   private IReferenceType value;
   private String type = "dictionary";
 
-  public Dictionary(IReferenceType key, IReferenceType value) {
+  public DictionaryType(IReferenceType key, IReferenceType value) {
     this.key = key;
     this.value = value;
   }
 
-  protected Dictionary() {}
+  protected DictionaryType() {}
 
   public IReferenceType getKey() {
     return key;
@@ -51,7 +51,7 @@ public void setType(String type) {
 
   @Override
   public String toString() {
-    return "Dictionary [key=" + key + ", value=" + value + "]";
+    return "DictionaryType [key=" + key + ", value=" + value + "]";
   }