8000 chore: update dependent services by ashleythedeveloper · Pull Request #297 · uncefact/tests-untp · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

chore: update dependent services #297

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

Merged
merged 1 commit into from
Jun 16, 2025
Merged

chore: update dependent services #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions README.md
View file
8000 Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,13 @@ The Identity Resolver and Mock Global GS1 Resolver services require seed data to
```bash
# Set environment variables
export IDR_SERVICE_HOST=localhost # IDR service host
export IDR_SERVICE_API_VERSION=1.0.0 # IDR API version
export IDR_SERVICE_PORT=3000 # IDR service port
export IDR_SERVICE_API_KEY=test123 # IDR service API key
export IDR_SERVICE_DOMAIN=http://localhost:3000 # IDR service domain

export MOCK_GS1_SERVICE_HOST=localhost # Mock GS1 service host
export MOCK_GS1_SERVICE_API_VERSION=1.0.0 # Mock GS1 service API version
export MOCK_GS1_SERVICE_PORT=3001 # Mock GS1 service port
export MOCK_GS1_SERVICE_API_KEY=test456 # Mock GS1 service API key

Expand Down
62 changes: 31 additions & 31 deletions app-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,13 @@
"dlrVerificationPage": "http://localhost:3003/verify"
},
"dlr": {
"dlrAPIUrl": "http://localhost:3000",
"dlrAPIUrl": "http://localhost:3000/api/1.0.0",
"dlrAPIKey": "test123",
"namespace": "gs1",
"linkRegisterPath": "/api/resolver"
"linkRegisterPath": "resolver"
},
"storage": {
"url": "http://localhost:3334/v1/documents",
"url": "http://localhost:3334/api/1.0.0/documents",
"params": {
"bucket": "verifiable-credentials"
},
Expand Down Expand Up @@ -497,13 +497,13 @@
"dlrVerificationPage": "http://localhost:3003/verify"
},
"dlr": {
"dlrAPIUrl": "http://localhost:3000",
"dlrAPIUrl": "http://localhost:3000/api/1.0.0",
"dlrAPIKey": "test123",
"namespace": "gs1",
"linkRegisterPath": "/api/resolver"
"linkRegisterPath": "resolver"
},
"storage": {
"url": "http://localhost:3334/v1/documents",
"url": "http://localhost:3334/api/1.0.0/documents",
"params": {
"bucket": "verifiable-credentials"
},
Expand Down Expand Up @@ -800,13 +800,13 @@
"dlrVerificationPage": "http://localhost:3003/verify"
},
"dlr": {
"dlrAPIUrl": "http://localhost:3000",
"dlrAPIUrl": "http://localhost:3000/api/1.0.0",
"dlrAPIKey": "test123",
"namespace": "gs1",
"linkRegisterPath": "/api/resolver"
"linkRegisterPath": "resolver"
},
"storage": {
"url": "http://localhost:3334/v1/documents",
"url": "http://localhost:3334/api/1.0.0/documents",
"params": {
"bucket": "verifiable-credentials"
},
Expand Down Expand Up @@ -839,9 +839,9 @@
"id": "example:product/1234",
"product": {
"type": ["Product"],
"id": "https://id.gs1.org/01/09520123456788/21/12345",
"id": "https://id.gs1.org/01/09359502000034/21/12345",
"name": "EV battery 300Ah",
"registeredId": "09520123456788.21.12345",
"registeredId": "09359502000034",
"idScheme": {
"type": ["IdentifierScheme"],
"id": "https://id.gs1.org/01/",
Expand Down Expand Up @@ -893,7 +893,7 @@
},
"productionDate": "2024-04-25",
"countryOfProduction": "AU",
"serialNumber": "12345678",
"serialNumber": "12345",
"dimensions": {
"weight": {
"value": 10,
Expand Down Expand Up @@ -1144,13 +1144,13 @@
"dlrVerificationPage": "http://localhost:3003/verify"
},
"dlr": {
"dlrAPIUrl": "http://localhost:3000",
"dlrAPIUrl": "http://localhost:3000/api/1.0.0",
"dlrAPIKey": "test123",
"namespace": "gs1",
"linkRegisterPath": "/api/resolver"
"linkRegisterPath": "resolver"
},
"storage": {
"url": "http://localhost:3334/v1/credentials",
"url": "http://localhost:3334/api/1.0.0/documents",
"params": {
"bucket": "verifiable-credentials"
},
Expand Down Expand Up @@ -1274,13 +1274,13 @@
"dlrVerificationPage": "http://localhost:3003/verify"
},
"dlr": {
"dlrAPIUrl": "http://localhost:3000",
"dlrAPIUrl": "http://localhost:3000/api/1.0.0",
"dlrAPIKey": "test123",
"namespace": "gs1",
"linkRegisterPath": "/api/resolver"
"linkRegisterPath": "resolver"
},
"storage": {
"url": "http://localhost:3334/v1/documents",
"url": "http://localhost:3334/api/1.0.0/documents",
"params": {
"bucket": "verifiable-credentials"
},
Expand Down Expand Up @@ -1403,13 +1403,13 @@
"dlrVerificationPage": "http://localhost:3003/verify"
},
"dlr": {
"dlrAPIUrl": "http://localhost:3000",
"dlrAPIUrl": "http://localhost:3000/api/1.0.0",
"dlrAPIKey": "test123",
"namespace": "gs1",
"linkRegisterPath": "/api/resolver"
"linkRegisterPath": "resolver"
},
"storage": {
"url": "http://localhost:3334/v1/documents",
"url": "http://localhost:3334/api/1.0.0/documents",
"params": {
"bucket": "verifiable-credentials"
},
Expand Down Expand Up @@ -1541,13 +1541,13 @@
"dlrVerificationPage": "http://localhost:3003/verify"
},
"dlr": {
"dlrAPIUrl": "http://localhost:3000",
"dlrAPIUrl": "http://localhost:3000/api/1.0.0",
"dlrAPIKey": "test123",
"namespace": "gs1",
"linkRegisterPath": "/api/resolver"
"linkRegisterPath": "resolver"
},
"storage": {
"url": "http://localhost:3334/v1/documents",
"url": "http://localhost:3334/api/1.0.0/documents",
"params": {
"bucket": "verifiable-credentials"
},
Expand Down Expand Up @@ -1675,13 +1675,13 @@
"dlrVerificationPage": "http://localhost:3003/verify"
},
"dlr": {
"dlrAPIUrl": "http://localhost:3000",
"dlrAPIUrl": "http://localhost:3000/api/1.0.0",
"dlrAPIKey": "test123",
"namespace": "gs1",
"linkRegisterPath": "/api/resolver"
"linkRegisterPath": "resolver"
},
"storage": {
"url": "http://localhost:3334/v1/documents",
"url": "http://localhost:3334/api/1.0.0/documents",
"params": {
"bucket": "verifiable-credentials"
},
Expand Down Expand Up @@ -1812,13 +1812,13 @@
"dlrVerificationPage": "http://localhost:3003/verify"
},
"dlr": {
"dlrAPIUrl": "http://localhost:3000",
"dlrAPIUrl": "http://localhost:3000/api/1.0.0",
"dlrAPIKey": "test123",
"namespace": "gs1",
"linkRegisterPath": "/api/resolver"
"linkRegisterPath": "resolver"
},
"storage": {
"url": "http://localhost:3334/v1/documents",
"url": "http://localhost:3334/api/1.0.0/documents",
"params": {
"bucket": "verifiable-credentials"
},
Expand All @@ -1841,7 +1841,7 @@
],
"identifyProvider": {
"type": "gs1",
"url": "http://localhost:3001",
"url": "http://localhost:3001/api/1.0.0",
"namespace": "gs1"
},
"identifierSchemes": [
Expand Down
18 changes: 10 additions & 8 deletions docker-compose.e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ services:
restart: always

storage-service:
image: ghcr.io/uncefact/project-identity-resolver:sha-e87d4fc@sha256:54ee7f3adaab9650052b99dbe19b3f5bbd2aa2fe7588410c5f66d1941e3752ce
image: ghcr.io/uncefact/project-identity-resolver:latest@sha256:06a69d27ee0547cc0e3ce56243b0d3fbff164f804e586de4c78e580b61d971ca
ports:
- 3334:3334
environment:
Expand All @@ -45,7 +45,7 @@ services:
- STORAGE_TYPE=local

identity-resolver-service:
image: ghcr.io/pyx-industries/pyx-identity-resolver:sha-3b4ce08-local@sha256:91b2a9b324d8253e217b6501bf7c715b725551a744891eb24e7e71b9e9a1d69a
image: ghcr.io/pyx-industries/pyx-identity-resolver:sha-1f21512-local@sha256:af3cb7f2cffdbac501832ee484215cecc8f8d6ac3f571c9f239d61d8cbc74050
ports:
- '3000:3000'
environment:
Expand All @@ -60,8 +60,8 @@ services:
- API_KEY=test123
- APP_ENDPOINT=http://localhost:3000
- APP_NAME=IDR-1
- RESOLVER_DOMAIN=http://localhost:3000
- LINK_TYPE_VOC_DOMAIN=http://localhost:3000/voc
- RESOLVER_DOMAIN=http://localhost:3000/api/1.0.0
- LINK_TYPE_VOC_DOMAIN=http://localhost:3000/api/1.0.0/voc
- PORT=3000
depends_on:
- identity-resolver-service-object-store
Expand All @@ -79,7 +79,7 @@ services:
- ./minio_data/identity-resolver-service-object-store/data-test:/data

mock-global-gs1-resolver:
image: ghcr.io/pyx-industries/pyx-identity-resolver:sha-fa017fb-local@sha256:cd514863bdaf65ab1b47b8e71669a0245b041c861285a83fa7cf0a65789d4e58
image: ghcr.io/pyx-industries/pyx-identity-resolver:sha-1f21512-local@sha256:af3cb7f2cffdbac501832ee484215cecc8f8d6ac3f571c9f239d61d8cbc74050
ports:
- '3001:3001'
environment:
Expand All @@ -94,8 +94,8 @@ services:
- API_KEY=test456
- APP_ENDPOINT=http://localhost:3001
- APP_NAME=IDR-2
- RESOLVER_DOMAIN=http://localhost:3001
- LINK_TYPE_VOC_DOMAIN=http://localhost:3001/voc
- RESOLVER_DOMAIN=http://localhost:3001/api/1.0.0
- LINK_TYPE_VOC_DOMAIN=http://localhost:3001/api/1.0.0/voc
- PORT=3001
depends_on:
- mock-global-gs1-resolver-object-store
Expand All @@ -110,19 +110,21 @@ services:
- MINIO_ROOT_USER=minioadmin
- MINIO_ROOT_PASSWORD=minioadmin
volumes:
- ./minio_data/mock-global-gs1-resolver-object-store:/data
- ./minio_data/mock-global-gs1-resolver-object-store/data-test:/data

seeding-data:
image: alpine:3.20.3
environment:
# IDR service environment variables
- IDR_SERVICE_HOST=identity-resolver-service
- IDR_SERVICE_API_VERSION=1.0.0
- IDR_SERVICE_PORT=3000
- IDR_SERVICE_API_KEY=test123

# Mock GS1 service environment variables
- IDR_SERVICE_DOMAIN=http://localhost:3000
- MOCK_GS1_SERVICE_HOST=mock-global-gs1-resolver
- MOCK_GS1_SERVICE_API_VERSION=1.0.0
- MOCK_GS1_SERVICE_PORT=3001
- MOCK_GS1_SERVICE_API_KEY=test456
command:
Expand Down
16 changes: 9 additions & 7 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ services:
restart: always

storage-service:
image: ghcr.io/uncefact/project-identity-resolver:sha-e87d4fc@sha256:54ee7f3adaab9650052b99dbe19b3f5bbd2aa2fe7588410c5f66d1941e3752ce
image: ghcr.io/uncefact/project-identity-resolver:latest@sha256:06a69d27ee0547cc0e3ce56243b0d3fbff164f804e586de4c78e580b61d971ca
ports:
- 3334:3334
environment:
Expand All @@ -59,7 +59,7 @@ services:

identity-resolver-service:
# Replace with local or deployed image
image: ghcr.io/pyx-industries/pyx-identity-resolver:sha-3b4ce08-local@sha256:91b2a9b324d8253e217b6501bf7c715b725551a744891eb24e7e71b9e9a1d69a
image: ghcr.io/pyx-industries/pyx-identity-resolver:sha-1f21512-local@sha256:af3cb7f2cffdbac501832ee484215cecc8f8d6ac3f571c9f239d61d8cbc74050
ports:
- '3000:3000'
environment:
Expand All @@ -74,8 +74,8 @@ services:
- API_KEY=test123
- APP_ENDPOINT=http://localhost:3000
- APP_NAME=IDR-1
- RESOLVER_DOMAIN=http://localhost:3000
- LINK_TYPE_VOC_DOMAIN=http://localhost:3000/voc
- RESOLVER_DOMAIN=http://localhost:3000/api/1.0.0
- LINK_TYPE_VOC_DOMAIN=http://localhost:3000/api/1.0.0/voc
- PORT=3000
depends_on:
- identity-resolver-service-object-store
Expand All @@ -94,7 +94,7 @@ services:

mock-global-gs1-resolver:
# Replace with local or deployed image
image: ghcr.io/pyx-industries/pyx-identity-resolver:sha-fa017fb-local@sha256:cd514863bdaf65ab1b47b8e71669a0245b041c861285a83fa7cf0a65789d4e58
image: ghcr.io/pyx-industries/pyx-identity-resolver:sha-1f21512-local@sha256:af3cb7f2cffdbac AA2F 501832ee484215cecc8f8d6ac3f571c9f239d61d8cbc74050
ports:
- '3001:3001'
environment:
Expand All @@ -109,8 +109,8 @@ services:
- API_KEY=test456
- APP_ENDPOINT=http://localhost:3001
- APP_NAME=IDR-2
- RESOLVER_DOMAIN=http://localhost:3001
- LINK_TYPE_VOC_DOMAIN=http://localhost:3001/voc
- RESOLVER_DOMAIN=http://localhost:3001/api/1.0.0
- LINK_TYPE_VOC_DOMAIN=http://localhost:3001/api/1.0.0/voc
- PORT=3001
depends_on:
- mock-global-gs1-resolver-object-store
Expand All @@ -132,12 +132,14 @@ services:
environment:
# IDR service environment variables
- IDR_SERVICE_HOST=identity-resolver-service
- IDR_SERVICE_API_VERSION=1.0.0
- IDR_SERVICE_PORT=3000
- IDR_SERVICE_API_KEY=test123

# Mock GS1 service environment variables
- IDR_SERVICE_DOMAIN=http://localhost:3000
- MOCK_GS1_SERVICE_HOST=mock-global-gs1-resolver
- MOCK_GS1_SERVICE_API_VERSION=1.0.0
- MOCK_GS1_SERVICE_PORT=3001
- MOCK_GS1_SERVICE_API_KEY=test456
command:
Expand Down
Loading
Loading
0