Merge pull request #10 from secure-software-engineering/develop

fix docker cmp

Author: anddann

docker-compose-upcy-dockerized.yml

@@ -18,10 +18,9 @@ services:
   #creates the work messages
   producer:
     restart: always
-    image: ghcr.io/anddann/upcy:1.6-SNAPSHOT
+    image: ghcr.io/anddann/upcy:1.6.1-SNAPSHOT
     depends_on:
       - rabbitmq
-      - fileServer
     deploy:
       # we only need one producer
       replicas: 1
@@ -30,6 +29,8 @@ services:
         condition: on-failure
         delay: 90s
         window: 240s
+    volumes:
+      - ./upcyresults:/mnt/results
     env_file:
       - ./upcy.sample.env
     environment:
@@ -39,7 +40,7 @@ services:
 
   worker:
     restart: always
-    image: ghcr.io/anddann/upcy:1.6-SNAPSHOT
+    image: ghcr.io/anddann/upcy:1.6.1-SNAPSHOT
     deploy:
       replicas: 2
       mode: replicated
@@ -51,14 +52,16 @@ services:
       - rabbitmq
       - producer
     volumes:
-      - ./upcy-results-folder:/mnt/results
+      - ./upcyresults:/mnt/results
     env_file:
       - ./upcy.sample.env
     environment:
       - WORKER_NODE=true
       - TIMEOUT=21600
     networks:
       - pipeline-net
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
 
 networks:
   pipeline-net:

src/main/java/de/upb/upcy/update/dockerize/IClient.java

@@ -16,7 +16,7 @@ public static IClient createClient(String host, String user, String pass) {
     // Todo make nice in the future
     if (host.startsWith("http://") || host.startsWith("https://")) {
       return new WebDavClient(host, user, pass);
-    } else if (host.startsWith("file://")) {
+    } else if (host.startsWith("file:/")) {
       return new LocalClient(host);
     }
     return null;

src/main/java/de/upb/upcy/update/dockerize/LocalClient.java

@@ -3,6 +3,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import org.apache.maven.surefire.shared.io.FileUtils;
@@ -17,6 +18,10 @@ public class LocalClient implements IClient {
 
   LocalClient(String rootPath) {
     this.rootDir = Paths.get(URI.create(rootPath));
+    if (!Files.exists(rootDir) && !Files.isDirectory(rootDir)) {
+      throw new IllegalArgumentException(String.format("No valid folder %s", rootPath));
+    }
+
     LOGGER.info("Created LocalClient");
   }
 

src/test/java/de/upb/upcy/update/dockerize/IClientTest.java

@@ -0,0 +1,11 @@
+package de.upb.upcy.update.dockerize;
+
+import junit.framework.TestCase;
+
+public class IClientTest extends TestCase {
+
+  public void testCreateClient() {
+    final IClient client = IClient.createClient("file:/home", "", "");
+    assertTrue(client instanceof LocalClient);
+  }
+}

upcy.sample.env

@@ -4,8 +4,8 @@ NEO4J_USER=neo4j
 NEO4J_PASS=DUMMYPASSWORD
 RABBITMQ_USER=myuser
 RABBITMQ_PASS=mypassword
-# to use local folder start with file://.....
-FILESERVER_HOST=file://mnt/results
+# to use local folder start with file:/.....
+FILESERVER_HOST=file:/mnt/results
 FILESERVER_USER=myuser
 FILESERVER_PASS=DUMMYPASSWORD
 MONGO_HOST=host.docker.internal