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.

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

Chore/edc 0.7.0 infra #351

Merged
merged 21 commits into from
May 21, 2024
Merged
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
5c72cbd
chore(edc): version increase wip
tom-rm-meyer-ISST Apr 23, 2024
14632d0
refactor(bdrs): move to infrastructure docker
tom-rm-meyer-ISST Apr 25, 2024
e30b7a6
refactor(docker-compose-edc): refactor to get to old state
tom-rm-meyer-ISST Apr 29, 2024
652e876
refactor(local): cleanup bdrs and so on
tom-rm-meyer-ISST Apr 29, 2024
ed119a2
feat(iam-mock): added iam-mock to infrastructure
tom-rm-meyer-ISST Apr 29, 2024
0041b97
feat(iam-mock): added non-root user to dockerfile
tom-rm-meyer-ISST Apr 30, 2024
7ce0213
chore: updated frontend license file
tom-rm-meyer-ISST Apr 30, 2024
85b3a3a
refactor(local): made dtr and edc of customer / supplier share one db…
tom-rm-meyer-ISST Apr 30, 2024
6f5db7f
refactor(local): made dtr and edc of customer / supplier share one db…
tom-rm-meyer-ISST May 3, 2024
19bdf5c
feat(iam-mock): added sts edr refresh workflow mock
tom-rm-meyer-ISST May 6, 2024
057a2f0
ci(.tractusx): exclude iam-mock Docker from qGate check as not distri…
tom-rm-meyer-ISST May 7, 2024
fdfaf8f
refactor(local deployment): removed comments and made mock-util only …
tom-rm-meyer-ISST May 14, 2024
4e56c84
refactor(generate-keys.sh): generate file seed-bdrs.sh
tom-rm-meyer-ISST May 14, 2024
60fa49f
chore(mock-util-service): updated dependencies
tom-rm-meyer-ISST May 14, 2024
14106c6
Merge branch 'main' into chore/edc-0.7.0-infra
tom-rm-meyer-ISST May 15, 2024
60c191d
chore: updated frontend dependencies
tom-rm-meyer-ISST May 15, 2024
815fd42
fix(iam-mock): corrected claims in credential flow
tom-rm-meyer-ISST May 16, 2024
b268dd7
fix(local/docker-compose.yaml): corrected version of dtr-supplier (me…
tom-rm-meyer-ISST May 16, 2024
7f42181
chore(tractus-x-edc/docker-compose.yaml): bump version to 0.7.1
tom-rm-meyer-ISST May 16, 2024
daae340
Merge branch 'main' into chore/edc-0.7.0-infra
tom-rm-meyer-ISST May 17, 2024
ec0b456
chore: remove unused edc compose and notes during migration
tom-rm-meyer-ISST May 21, 2024
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
Prev Previous commit
Next Next commit
fix(local/docker-compose.yaml): corrected version of dtr-supplier (me…
…rge issue)
tom-rm-meyer-ISST committed May 16, 2024

Verified

This commit was signed with the committer’s verified signature.
commit b268dd728255de12f15698916b7d80d9a921a75f
1 change: 0 additions & 1 deletion local/docker-compose-infrastructure.yaml
Original file line number Diff line number Diff line change
@@ -104,7 +104,6 @@ services:
- "127.0.0.1:8582:8582"
networks:
- miw-net
# TODO check cacerts need in deployment.yaml
networks:
miw-net:
name: miw-net
6 changes: 3 additions & 3 deletions local/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -83,7 +83,7 @@ services:
postgres-all:
condition: service_healthy
healthcheck:
test: [ "CMD", "wget", "-q", "--spider", "http://localhost:4243/api/v3/shell-descriptors" ]
test: ["CMD", "wget", "-q", "--spider", "http://localhost:4243/api/v3/shell-descriptors"]
interval: 4s
timeout: 3s
retries: 15
@@ -227,13 +227,13 @@ services:
- "host.docker.internal:host-gateway" # Adjusts container's host file to allow for communication with docker-host machine

dtr-supplier:
image: tractusx/sldt-digital-twin-registry:0.3.23
image: tractusx/sldt-digital-twin-registry:0.4.3
container_name: dtr-supplier
depends_on:
postgres-all:
condition: service_healthy
healthcheck:
test: [ "CMD", "wget", "-q", "--spider", "http://localhost:4243/api/v3/shell-descriptors" ]
test: ["CMD", "wget", "-q", "--spider", "http://localhost:4243/api/v3/shell-descriptors"]
interval: 4s
timeout: 3s
retries: 15