Skip to content

Commit 40a240c

Browse files
aaronziFriedJannikchris-kooMartin187187
authored
Updates the minimal example to only go components (#210)
Co-authored-by: Jannik Fried <Jannik.Fried@iese.fraunhofer.de> Co-authored-by: chris-koo <chris-koo@users.noreply.github.com> Co-authored-by: Martin Stemmer <Martin187187@users.noreply.github.com>
1 parent 9169506 commit 40a240c

File tree

5 files changed

+172
-62
lines changed

5 files changed

+172
-62
lines changed

‎examples/BaSyxMinimalExample/basyx/aas-env.properties‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎examples/BaSyxMinimalExample/basyx/rsa-cert.pem‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDnjCCAgYCCQDG28qiDgqadTANBgkqhkiG9w0BAQsFADAQMQ4wDAYDVQQDDAVi
3+
YXN5eDAgFw0yNjAxMjExOTAzMjlaGA8yMTI1MTIyODE5MDMyOVowEDEOMAwGA1UE
4+
AwwFYmFzeXgwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDBaEyTYU94
5+
ZN9xPMFA3pQCTkIZOd/gOC0BdXqT3Bj6Y1oeYV6zn54qtC45JzvVNfPPOkACuZiT
6+
eoLOJDwS0qForBIBMurTWW86AmT39ammvx+ONKPpBInuJWsXCSww2CvCXUsA3XHR
7+
NdWcMbrZT/onzh3tCr+9An3xVnEbjXPjv1HXEy+LFSOxHpRzITOmmJfDWChTZUnn
8+
00XMce7RzaOcrhtR68P3PXJ7gFz4+ER7Da1gbBhWcQPd3N3MXwSur6Aay7dYx2dN
9+
AmINkPzLoDwkKGf/PK+xOMT6pGPd9pl4XM7Pj/7fTm+/IkbkCz+HnyQ6cQVSv03K
10+
NxfXwnhO+qnAWoAU+rcgM77FzLvB78CLb4iFP8A3FNpmeNpI0kHTk/vduRZX7kvU
11+
7fulp2/UCpK7HfoXTK2qaac/x1w/zoTFMpqUQIbu1ahddTPRRhLzTFwsXdE5xOVA
12+
u2PIe6iPwop6vXaLu1Lp5b7zMwqQR0x/i/cNfJJH88sYgqotY/gFkS8CAwEAATAN
13+
BgkqhkiG9w0BAQsFAAOCAYEAeM6g/fOuhLH9BBLaV7GMzvHURAnrRy2gjHxKsmVd
14+
72FXLYkktUleOeA9R3oztBgHxG+eoO8cU441/fAjb6Pj23sNXt4pTjSH2n6VWjQZ
15+
i/uFeloEHcLty4qno1LgonmY+LrA1VrungMCKPTaBiqq3oO7zj7AGye2G0up07XV
16+
I+nyD2+bgR0GEdBI1vDk8Ce5YLhaWLZmTf/ggKSEDzQUbjJhOaJISAYP1jmkB06Q
17+
Pq4WscjN5F5670aEp/YMbVubJu9PX4eSP5E/t/1ZXbxm0SeUAouWlBUT/EkbMslo
18+
M43R19vykWNCHHgKAYvD2sHzH+fcR6Z5kX9AM8TV0sD/MNyx6gy1lyjd6owQTXOM
19+
Rf3L1ZMarQguqrjyetmdaXtBJmTIJu/rfYUEAEgKGLlSYVwjKscbhzTrG12qdgrg
20+
P0rgdFvZNgWJWK+loHe3xLiJ5JhLHiAIx3n8xkmwQFUntFVY67I0k7sERctDNx86
21+
LHRqFaRfRz4GZ6Bija9XbJHe
22+
-----END CERTIFICATE-----

‎examples/BaSyxMinimalExample/basyx/rsa-key.pem‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
-----BEGIN PRIVATE KEY-----
2+
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
39+
XlEIKKv1QOtkQaUPbYva9g==
40+
-----END PRIVATE KEY-----

‎examples/BaSyxMinimalExample/basyx/sm-registry.yml‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎examples/BaSyxMinimalExample/docker-compose.yml‎

Lines changed: 110 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,11 @@
11
services:
2-
aas-env:
3-
container_name: aas-environment
4-
image: eclipsebasyx/aas-environment:2.0.0-SNAPSHOT
5-
volumes:
6-
- ./basyx/aas-env.properties:/application/application.properties
7-
- ./aas:/application/aas
8-
ports:
9-
- 8081:8081
10-
depends_on:
11-
aas-registry:
12-
condition: service_healthy
13-
sm-registry:
14-
condition: service_healthy
15-
aas-discovery:
16-
condition: service_healthy
17-
182
aas-registry:
193
container_name: aas-registry
204
image: eclipsebasyx/aasregistry-go:SNAPSHOT
215
ports:
22-
- 8082:8080
6+
- 8082:5004
237
environment:
24-
- SERVER_PORT=8080
8+
- SERVER_PORT=5004
259
- CORS_ALLOWEDORIGINS=*
2610
- CORS_ALLOWEDHEADERS=*
2711
- CORS_ALLOWEDCREDENTIALS=true
@@ -35,29 +19,41 @@ services:
3519
- POSTGRES_MAXIDLECONNECTIONS=500
3620
- POSTGRES_CONNMAXLIFETIMEMINUTES=5
3721
- ABAC_ENABLED=false
38-
healthcheck:
39-
test: ["CMD", "wget", "--quiet", "--tries=1", "--output-document=-", "http://localhost:8080/health"]
40-
interval: 10s
41-
timeout: 5s
42-
retries: 5
43-
start_period: 10s
4422
depends_on:
4523
db:
4624
condition: service_healthy
47-
25+
restart: unless-stopped
26+
4827
sm-registry:
4928
container_name: sm-registry
50-
image: eclipsebasyx/submodel-registry-log-mem:2.0.0-SNAPSHOT
29+
image: eclipsebasyx/submodelregistry-go:SNAPSHOT
30+
environment:
31+
- SERVER_PORT=5004
32+
- CORS_ALLOWEDORIGINS=*
33+
- CORS_ALLOWEDHEADERS=*
34+
- CORS_ALLOWEDCREDENTIALS=true
35+
- CORS_ALLOWEDMETHODS=GET,POST,PUT,PATCH,DELETE,OPTIONS
36+
- POSTGRES_HOST=db
37+
- POSTGRES_PORT=5432
38+
- POSTGRES_USER=admin
39+
- POSTGRES_PASSWORD=admin123
40+
- POSTGRES_DBNAME=basyxTestDB
41+
- POSTGRES_MAXOPENCONNECTIONS=500
42+
- POSTGRES_MAXIDLECONNECTIONS=500
43+
- POSTGRES_CONNMAXLIFETIMEMINUTES=5
44+
- ABAC_ENABLED=false
5145
ports:
52-
- 8083:8080
53-
volumes:
54-
- ./basyx/sm-registry.yml:/workspace/config/application.yml
46+
- 8083:5004
47+
depends_on:
48+
db:
49+
condition: service_healthy
50+
restart: unless-stopped
5551

5652
aas-discovery:
5753
container_name: aas-discovery
5854
image: eclipsebasyx/aasdiscovery-go:SNAPSHOT
5955
environment:
60-
- SERVER_PORT=8081
56+
- SERVER_PORT=5004
6157
- CORS_ALLOWEDORIGINS=*
6258
- CORS_ALLOWEDHEADERS=*
6359
- CORS_ALLOWEDCREDENTIALS=true
@@ -72,17 +68,11 @@ services:
7268
- POSTGRES_CONNMAXLIFETIMEMINUTES=5
7369
- ABAC_ENABLED=false
7470
ports:
75-
- "8084:8081"
76-
healthcheck:
77-
test: ["CMD", "wget", "--quiet", "--tries=1", "--output-document=-", "http://localhost:8081/health"]
78-
interval: 10s
79-
timeout: 5s
80-
retries: 5
81-
start_period: 10s
71+
- "8084:5004"
8272
depends_on:
8373
db:
8474
condition: service_healthy
85-
75+
restart: unless-stopped
8676

8777
aas-ui:
8878
container_name: aas-web-ui
@@ -93,13 +83,88 @@ services:
9383
AAS_REGISTRY_PATH: "http://localhost:8082/shell-descriptors"
9484
SUBMODEL_REGISTRY_PATH: "http://localhost:8083/submodel-descriptors"
9585
AAS_DISCOVERY_PATH: "http://localhost:8084/lookup/shells"
96-
AAS_REPO_PATH: "http://localhost:8081/shells"
97-
SUBMODEL_REPO_PATH: "http://localhost:8081/submodels"
98-
CD_REPO_PATH: "http://localhost:8081/concept-descriptions"
99-
restart: always
86+
AAS_REPO_PATH: "http://localhost:8090/shells"
87+
SUBMODEL_REPO_PATH: "http://localhost:8091/submodels"
88+
CD_REPO_PATH: "http://localhost:8092/concept-descriptions"
89+
restart: unless-stopped
90+
91+
aas_repository:
92+
container_name: aas-repository
93+
image: eclipsebasyx/aasrepository-go:SNAPSHOT
94+
environment:
95+
- SERVER_PORT=5004
96+
- CORS_ALLOWEDORIGINS=*
97+
- CORS_ALLOWEDHEADERS=*
98+
- CORS_ALLOWEDCREDENTIALS=true
99+
- CORS_ALLOWEDMETHODS=GET,POST,PUT,PATCH,DELETE,OPTIONS
100+
- POSTGRES_HOST=db
101+
- POSTGRES_PORT=5432
102+
- POSTGRES_USER=admin
103+
- POSTGRES_PASSWORD=admin123
104+
- POSTGRES_DBNAME=basyxTestDB
105+
- POSTGRES_MAXOPENCONNECTIONS=500
106+
- POSTGRES_MAXIDLECONNECTIONS=500
107+
- POSTGRES_CONNMAXLIFETIMEMINUTES=5
108+
- ABAC_ENABLED=false
109+
ports:
110+
- "8090:5004"
111+
depends_on:
112+
db:
113+
condition: service_healthy
114+
restart: unless-stopped
115+
116+
submodel_repository:
117+
container_name: submodel-repository
118+
image: eclipsebasyx/submodelrepository-go:SNAPSHOT
119+
environment:
120+
- SERVER_PORT=5004
121+
- CORS_ALLOWEDORIGINS=*
122+
- CORS_ALLOWEDHEADERS=*
123+
- CORS_ALLOWEDCREDENTIALS=true
124+
- CORS_ALLOWEDMETHODS=GET,POST,PUT,PATCH,DELETE,OPTIONS
125+
- POSTGRES_HOST=db
126+
- POSTGRES_PORT=5432
127+
- POSTGRES_USER=admin
128+
- POSTGRES_PASSWORD=admin123
129+
- POSTGRES_DBNAME=basyxTestDB
130+
- POSTGRES_MAXOPENCONNECTIONS=500
131+
- POSTGRES_MAXIDLECONNECTIONS=500
132+
- POSTGRES_CONNMAXLIFETIMEMINUTES=5
133+
- JWS_PRIVATEKEYPATH=/app/rsa-key.pem
134+
- ABAC_ENABLED=false
135+
volumes:
136+
- ./basyx/rsa-key.pem:/app/rsa-key.pem:ro
137+
ports:
138+
- "8091:5004"
100139
depends_on:
101-
aas-env:
140+
db:
141+
condition: service_healthy
142+
restart: unless-stopped
143+
144+
concept-description-repository:
145+
container_name: concept-description-repository
146+
image: eclipsebasyx/conceptdescriptionrepository-go:SNAPSHOT
147+
environment:
148+
- SERVER_PORT=5004
149+
- CORS_ALLOWEDORIGINS=*
150+
- CORS_ALLOWEDHEADERS=*
151+
- CORS_ALLOWEDCREDENTIALS=true
152+
- CORS_ALLOWEDMETHODS=GET,POST,PUT,PATCH,DELETE,OPTIONS
153+
- POSTGRES_HOST=db
154+
- POSTGRES_PORT=5432
155+
- POSTGRES_USER=admin
156+
- POSTGRES_PASSWORD=admin123
157+
- POSTGRES_DBNAME=basyxTestDB
158+
- POSTGRES_MAXOPENCONNECTIONS=500
159+
- POSTGRES_MAXIDLECONNECTIONS=500
160+
- POSTGRES_CONNMAXLIFETIMEMINUTES=5
161+
- ABAC_ENABLED=false
162+
ports:
163+
- "8092:5004"
164+
depends_on:
165+
db:
102166
condition: service_healthy
167+
restart: unless-stopped
103168

104169
# PostgreSQL database
105170
db:
@@ -109,11 +174,10 @@ services:
109174
POSTGRES_USER: admin
110175
POSTGRES_PASSWORD: admin123
111176
POSTGRES_DB: basyxTestDB
112-
ports:
113-
- "5432:5432"
114177
command: ["postgres", "-c", "listen_addresses=*"]
115178
healthcheck:
116179
test: ["CMD-SHELL", "pg_isready -U admin -d basyxTestDB"]
117180
interval: 10s
118181
timeout: 5s
119-
retries: 5
182+
retries: 5
183+
restart: unless-stopped

0 commit comments

Comments
 (0)