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

Develop

Author: anddann

default_env.sh

@@ -0,0 +1,10 @@
+export NEO4J_PORT=7687
+export NEO4J_URL=bolt://localhost:${NEO4J_PORT}
+export NEO4J_USER=neo4j
+export NEO4J_PASS=DUMMYPASSWORD
+export MONGO_HOST=localhost
+export MONGO_USER=user
+export MONGO_PW=DUMMYPASSWORD
+export MONGO_PORT=27017
+export MIN_PATH_LENGTH=5
+export NEO4J_TRANSACTION_TIMEOUT=300

docker-compose-dbs.yml

@@ -6,9 +6,9 @@ services:
     image: neo4j:4.4.3
     ports: # expose the ports to the local machine
       - "7474:7474"
-      - "7687:7687"
+      - "${NEO4J_PORT}:7687"
     environment:
-      - NEO4J_AUTH=neo4j/DUMMYPASSWORD
+      - NEO4J_AUTH=${NEO4J_USER}/${NEO4J_PASS}
       - NEO4J_apoc_export_file_enabled=true
       - NEO4J_apoc_import_file_enabled=true
       - NEO4J_apoc_import_file_use__neo4j__config=true
@@ -25,7 +25,7 @@ services:
   mongo:
     image: mongo:4.2
     ports: #expose ports to the outside
-      - "27017:27017"
+      - "${MONGO_PORT}:27017"
     volumes:
       - ./2022_07_14_mongodb/:/data/db
     environment:

docker-compose-upcy-dockerized.yml

@@ -18,7 +18,7 @@ services:
   #creates the work messages
   producer:
     restart: always
-    image: ghcr.io/anddann/upcy:1.6.1-SNAPSHOT
+    image: ghcr.io/anddann/upcy:1.6.2-SNAPSHOT
     depends_on:
       - rabbitmq
     deploy:
@@ -40,7 +40,7 @@ services:
 
   worker:
     restart: always
-    image: ghcr.io/anddann/upcy:1.6.1-SNAPSHOT
+    image: ghcr.io/anddann/upcy:1.6.2-SNAPSHOT
     deploy:
       replicas: 2
       mode: replicated

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>de.upb</groupId>
     <artifactId>upcy</artifactId>
-    <version>1.6.1-SNAPSHOT</version>
+    <version>1.6.2-SNAPSHOT</version>
 
     <properties>
         <docker.image.prefix>ghcr.io/anddann/</docker.image.prefix>
@@ -270,12 +270,12 @@
         <dependency>
             <groupId>de.upb.upcy.base</groupId>
             <artifactId>sigtest-generator</artifactId>
-            <version>0.5-SNAPSHOT</version>
+            <version>0.5.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>de.upb.upcy.base</groupId>
             <artifactId>commons</artifactId>
-            <version>0.5-SNAPSHOT</version>
+            <version>0.5.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>

upcy.sample.env

@@ -1,16 +1,17 @@
 RABBITMQ_HOST=rabbitmq
-NEO4J_URL=bolt://host.docker.internal:7687
-NEO4J_USER=neo4j
-NEO4J_PASS=DUMMYPASSWORD
+NEO4J_URL=bolt://host.docker.internal:${NEO4J_PORT}
+NEO4J_USER=${NEO4J_USER}
+NEO4J_PASS=${NEO4J_PASS}
 RABBITMQ_USER=myuser
 RABBITMQ_PASS=mypassword
 # to use local folder start with file:/.....
 FILESERVER_HOST=file:/mnt/results
 FILESERVER_USER=myuser
 FILESERVER_PASS=DUMMYPASSWORD
 MONGO_HOST=host.docker.internal
-MONGO_USER=user
-MONGO_PW=DUMMYPASSWORD
+MONGO_PORT=${MONGO_PORT}
+MONGO_USER=${MONGO_USER}
+MONGO_PW=${MONGO_PW}
 TIMEOUT=21600
 NEO4J_TRANSACTION_TIMEOUT=600
 MIN_PATH_LENGTH=5