conflicts

Author: omursahin

dockerfiles/angular-ecommerce.dockerfile renamed to dockerfiles/spring-ecommerce.dockerfile

@@ -1,6 +1,6 @@
 FROM amazoncorretto:8-alpine-jdk
 
-COPY ./dist/angular-ecommerce-sut.jar .
+COPY ./dist/spring-ecommerce-sut.jar .
 COPY ./dist/jacocoagent.jar .
 
 
@@ -11,7 +11,7 @@ COPY ./dist/jacocoagent.jar .
 ENTRYPOINT \
     java \
 #    unfortunately dumponexit is completely unreliable in Docker :(
-#    -javaagent:jacocoagent.jar=destfile=./jacoco/angular-ecommerce__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \
+#    -javaagent:jacocoagent.jar=destfile=./jacoco/spring-ecommerce__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \
     -javaagent:jacocoagent.jar=output=tcpserver,address=*,port=6300,append=false,dumponexit=false \
     -Dfile.encoding=ISO-8859-1 -jar angular-ecommerce-sut.jar \
     --server.port=8080 --spring.datasource.host=mongodb --spring.datasource.port=27017 --spring.datasource.database=test --spring.data.mongodb.uri=mongodb://mongodb:27017/test --spring.redis.host=redis --spring.redis.port=6379 --spring.data.elasticsearch.cluster-name=elasticsearch --spring.data.elasticsearch.cluster-nodes=elasticsearch:9300 --spring.elasticsearch.rest.uris=elasticsearch:9200 --spring.data.elasticsearch.host=elasticsearch --spring.data.elasticsearch.port=9300 --spring.cache.type=NONE

dockerfiles/angular-ecommerce.yaml renamed to dockerfiles/spring-ecommerce.yaml

@@ -1,7 +1,7 @@
 services:
   sut-angular-ecommerce:
     build:
-      dockerfile: ./dockerfiles/angular-ecommerce.dockerfile
+      dockerfile: ./dockerfiles/spring-ecommerce.dockerfile
       context: ..
 #    environment:
 #      TOOL: ${TOOL:-undefined}
@@ -26,8 +26,8 @@ services:
 
 
     volumes:
-      - ../scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh:/docker-entrypoint-initdb.d/mongo_import.sh
-      - ../scripts/dockerize/data/additional_files/angular-ecommerce/init.json:/fixtures/init.json
+      - ../scripts/dockerize/data/additional_files/spring-ecommerce/mongo_import.sh:/docker-entrypoint-initdb.d/mongo_import.sh
+      - ../scripts/dockerize/data/additional_files/spring-ecommerce/init.json:/fixtures/init.json
 
 
 

scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh

@@ -1,3 +1,2 @@
 #!/bin/bash
-
-mongoimport --host localhost --port 27017 --db test --collection User --file /fixtures/init.json --jsonArray
+mongoimport --host localhost --port 27017 --db test --collection User --file /fixtures/init.json --jsonArray