Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/update docker deployment #119

Merged
merged 3 commits into from
Dec 14, 2023
Merged

Feat/update docker deployment #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3217e2c
feat: updated properties
eschrewe Dec 13, 2023
55e95d4
fix: updated properties in test/resources
eschrewe Dec 13, 2023
c6dac05
Merge branch 'main' into feat/update_docker_deployment
eschrewe Dec 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions backend/src/test/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ edc.controlplane.key=${EDC_CONTROLPLANE_KEY:password}
edc.controlplane.management.url=${EDC_CONTROLPLANE_MANAGEMENT_URL:http://customer-control-plane:8181/management}
edc.controlplane.protocol.url=${EDC_CONTROLPLANE_PROTOCOL_URL:http://customer-control-plane:8184/api/v1/dsp}

# Needs to be set for forwarding http --> https
edc.web.rest.cors.enabled=true

# Jackson (JSON)
#spring.jackson.default-property-inclusion=non_empty
#logging.level.org.hibernate.SQL=DEBUG
Expand All @@ -31,18 +34,21 @@ spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true

# Own BPNL
own.bpnl=${OWN_BPNL:BPNL4444444444XX}

# Own name (self-description)
own.name=${OWN_NAME:Scenario Customer}
# Own BPNS (optional: if this is set, then set own.default.site.name as well)
own.default.bpns=${OWN_DEFAULT_BPNS:BPNS4444444444XX}

# Own BPNS (optional: if this is set, then set own.site.name as well)
own.bpns=${OWN_BPNS:BPNS4444444444XY}
# Name of Site (see above)
own.default.site.name=${OWN_DEFAULT_SITE_NAME:Hauptwerk Musterhausen}
own.site.name=${OWN_SITE:Hauptwerk Musterhausen}

# If a BPNS is set, then this BPNA will be attached to it.
# Otherwise, it will be attached immediately to the BPNL (see above)
own.default.bpna=${OWN_DEFAULT_BPNA:BPNA4444444444ZZ}
own.default.streetandnumber=${OWN_DEFAULT_STREETANDNUMBER:Musterstrasse 35b}
own.default.zipcodeandcity=${OWN_DEFAULT_ZIPCODEANDCITY:77777 Musterhausen}
own.default.country=${OWN_DEFAULT_COUNTRY:Germany}
own.bpna=${OWN_BPNA:BPNA4444444444ZZ}
own.streetandnumber=${OWN_STREETANDNUMBER:Musterstrasse 35b}
own.zipcodeandcity=${OWN_ZIPCODEANDCITY:77777 Musterhausen}
own.country=${OWN_COUNTRY:Germany}

# run with:
# ./mvnw spring-boot:run -Dspring-boot.run.arguments=--spring.config.location="./src/main/resources/application.properties"
12 changes: 6 additions & 6 deletions local/tractus-x-edc/config/customer/puris-backend.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ edc.controlplane.protocol.url=http://customer-control-plane:8184/api/v1/dsp

own.bpnl=BPNL4444444444XX
own.name=Scenario Customer
own.default.bpns=BPNS4444444444XX
own.default.site.name=Hauptwerk Musterhausen
own.default.bpna=BPNA4444444444AA
own.default.streetandnumber=Musterstrasse 35b
own.default.zipcodeandcity=77777 Musterhausen
own.default.country=Germany
own.bpns=BPNS4444444444XX
own.site.name=Hauptwerk Musterhausen
own.bpna=BPNA4444444444AA
own.streetandnumber=Musterstrasse 35b
own.zipcodeandcity=77777 Musterhausen
own.country=Germany


12 changes: 6 additions & 6 deletions local/tractus-x-edc/config/supplier/puris-backend.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ edc.controlplane.protocol.url=http://supplier-control-plane:9184/api/v1/dsp

own.bpnl=BPNL1234567890ZZ
own.name=Scenario Supplier
own.default.bpns=BPNS1234567890ZZ
own.default.site.name=Konzernzentrale Dudelsdorf
own.default.bpna=BPNA1234567890AA
own.default.streetandnumber=Heinrich-Supplier-Strasse 1
own.default.zipcodeandcity=77785 Dudelsdorf
own.default.country=Germany
own.bpns=BPNS1234567890ZZ
own.site.name=Konzernzentrale Dudelsdorf
own.bpna=BPNA1234567890AA
own.streetandnumber=Heinrich-Supplier-Strasse 1
own.zipcodeandcity=77785 Dudelsdorf
own.country=Germany


Loading