Skip to content

Commit 9f83bb5

Browse files
committed
docker
1 parent f60afe3 commit 9f83bb5

File tree

7 files changed

+100
-3
lines changed

7 files changed

+100
-3
lines changed
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
FROM amazoncorretto:8-alpine-jdk
2+
3+
COPY ./dist/angular-ecommerce-sut.jar .
4+
COPY ./dist/jacocoagent.jar .
5+
6+
7+
8+
#ENV TOOL="undefined"
9+
#ENV RUN="0"
10+
11+
ENTRYPOINT \
12+
java \
13+
# unfortunately dumponexit is completely unreliable in Docker :(
14+
# -javaagent:jacocoagent.jar=destfile=./jacoco/angular-ecommerce__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \
15+
-javaagent:jacocoagent.jar=output=tcpserver,address=*,port=6300,append=false,dumponexit=false \
16+
-Dfile.encoding=ISO-8859-1 -jar angular-ecommerce-sut.jar \
17+
--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.elsticsearch.cluster-nodes=elastic:9300 --spring.cache.type=NONE

dockerfiles/angular-ecommerce.yaml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
services:
2+
sut-angular-ecommerce:
3+
build:
4+
dockerfile: ./dockerfiles/angular-ecommerce.dockerfile
5+
context: ..
6+
# environment:
7+
# TOOL: ${TOOL:-undefined}
8+
# RUN: ${RUN:-0}
9+
ports:
10+
- "${HOST_PORT:-8080}:8080"
11+
- "${JACOCO_PORT:-6300}:6300"
12+
# volumes:
13+
# default env does not work on volumes
14+
# - ${JACOCODIR}:/jacoco
15+
16+
mongodb:
17+
image: mongo:7.0
18+
tmpfs:
19+
- '/data/db'
20+
21+
22+
environment:
23+
MONGODB_REPLICA_SET_MODE: primary
24+
ALLOW_EMPTY_PASSWORD: yes
25+
26+
27+
28+
volumes:
29+
- ../scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh:/docker-entrypoint-initdb.d/mongo_import.sh
30+
- ../scripts/dockerize/data/additional_files/angular-ecommerce/init.json:/fixtures/init.json
31+
32+
33+
34+
35+
36+
redis:
37+
image: redis:7.0.11
38+
39+
40+
41+
42+
43+
44+
elasticsearch:
45+
image: docker.elastic.co/elasticsearch/elasticsearch:6.8.23
46+
tmpfs:
47+
- '/usr/share/elasticsearch/data'
48+
49+
50+
environment:
51+
- discovery.type=single-node
52+
- cluster.name=elasticsearch
53+
- ES_JAVA_OPTS=-Xms512m -Xmx512m
54+
- xpack.security.enabled=false
55+
56+
57+
58+
59+
60+

jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/application.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ spring.redis.port=6379
1919
################# Elasticsearch Config ##################################
2020
spring.data.elasticsearch.repositories.enabled=true
2121
spring.data.elasticsearch.cluster-name=elasticsearch
22-
spring.data.elsticsearch.cluster-nodes=localhost:9300
22+
spring.data.elasticsearch.cluster-nodes=localhost:9300
2323
##########################################################################
2424
account.verification.url=http://localhost:8080/api/auth/accountVerification

jdk_8_maven/em/embedded/rest/angular-ecommerce/src/main/java/em/embedded/angular/ecommerce/EmbeddedEvoMasterController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public String startSut() {
114114
"--spring.redis.host=" + redisContainer.getContainerIpAddress(),
115115
"--spring.redis.port=" + redisContainer.getMappedPort(REDIS_PORT),
116116
"--spring.data.elasticsearch.cluster-name=elasticsearch",
117-
"--spring.data.elsticsearch.cluster-nodes=" + elasticsearchContainer.getContainerIpAddress() + ":" + elasticsearchContainer.getMappedPort(TRANSPORT_PORT),
117+
"--spring.data.elasticsearch.cluster-nodes=" + elasticsearchContainer.getContainerIpAddress() + ":" + elasticsearchContainer.getMappedPort(TRANSPORT_PORT),
118118
"--spring.cache.type=NONE"
119119
});
120120

jdk_8_maven/em/external/rest/angular-ecommerce/src/main/java/em/external/angular/ecommerce/ExternalEvoMasterController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public String[] getInputParameters() {
137137
"--spring.redis.host=" + redisContainer.getContainerIpAddress(),
138138
"--spring.redis.port=" + redisContainer.getMappedPort(REDIS_PORT),
139139
"--spring.data.elasticsearch.cluster-name=elasticsearch",
140-
"--spring.data.elsticsearch.cluster-nodes=" + elasticsearchContainer.getContainerIpAddress() + ":" + elasticsearchContainer.getMappedPort(TRANSPORT_PORT),
140+
"--spring.data.elasticsearch.cluster-nodes=" + elasticsearchContainer.getContainerIpAddress() + ":" + elasticsearchContainer.getMappedPort(TRANSPORT_PORT),
141141
"--spring.cache.type=NONE"
142142
};
143143
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
[
2+
{
3+
"_class": "com.techie.shoppingstore.model.User",
4+
"username": "user1",
5+
"email": "user1@email.com",
6+
"password": "$2a$12$p9eP3beaPuSMbS1enDn1Z.zFuv6npjm6xjyQnnEqvVG.CD03d1aoi",
7+
"enabled": true
8+
},
9+
{
10+
"_class": "com.techie.shoppingstore.model.User",
11+
"username": "user2",
12+
"email": "user2@email.com",
13+
"password": "$2a$12$p9eP3beaPuSMbS1enDn1Z.zFuv6npjm6xjyQnnEqvVG.CD03d1aoi",
14+
"enabled": true
15+
}
16+
]
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/bash
2+
# Import from fixtures
3+
4+
mongoimport --host localhost --port 27017 --db test --collection User --file /fixtures/init.json --jsonArray

0 commit comments

Comments
 (0)