Skip to content
This repository has been archived by the owner on Jun 4, 2024. It is now read-only.

The scope in the docker image is wrong, and the image source of docker compose should be indicated #138

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
54 changes: 45 additions & 9 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ services:
image: openzipkin/zipkin-slim:latest

basket-api:
image: ${REGISTRY:-eshopdapr}/basket.api:${TAG:-latest}
# #Pulling the image from dockerhub of eshopdapr can speed up the generation, but the local modification will not take effect
# image: ${REGISTRY:-eshopdapr}/basket.api:${TAG:-latest}
# # or
# # Using local code to build a docker image is slow
image: ${REGISTRY:-}/basket.api
build:
context: .
dockerfile: src/Services/Basket/Basket.API/Dockerfile
Expand All @@ -37,13 +41,21 @@ services:
- basket-api

blazor-client:
image: ${REGISTRY:-eshopdapr}/blazor.client:${TAG:-latest}
# #Pulling the image from dockerhub of eshopdapr can speed up the generation, but the local modification will not take effect
# image: ${REGISTRY:-eshopdapr}/blazor.client:${TAG:-latest}
# # or
# # Using local code to build a docker image is slow
image: ${REGISTRY:-}/blazor.client
build:
context: .
dockerfile: src/Web/BlazorClient.Host/Dockerfile

catalog-api:
image: ${REGISTRY:-eshopdapr}/catalog.api:${TAG:-latest}
# #Pulling the image from dockerhub of eshopdapr can speed up the generation, but the local modification will not take effect
# image: ${REGISTRY:-eshopdapr}/catalog.api:${TAG:-latest}
# # or
# # Using local code to build a docker image is slow
image: ${REGISTRY:-}/catalog.api
build:
context: .
dockerfile: src/Services/Catalog/Catalog.API/Dockerfile
Expand All @@ -57,7 +69,11 @@ services:
- catalog-api

identity-api:
image: ${REGISTRY:-eshopdapr}/identity.api:${TAG:-latest}
# #Pulling the image from dockerhub of eshopdapr can speed up the generation, but the local modification will not take effect
# image: ${REGISTRY:-eshopdapr}/identity.api:${TAG:-latest}
# # or
# # Using local code to build a docker image is slow
image: ${REGISTRY:-}/identity.api
build:
context: .
dockerfile: src/Services/Identity/Identity.API/Dockerfile
Expand All @@ -71,7 +87,11 @@ services:
- identity-api

ordering-api:
image: ${REGISTRY:-eshopdapr}/ordering.api:${TAG:-latest}
# #Pulling the image from dockerhub of eshopdapr can speed up the generation, but the local modification will not take effect
# image: ${REGISTRY:-eshopdapr}/ordering.api:${TAG:-latest}
# # or
# # Using local code to build a docker image is slow
image: ${REGISTRY:-}/ordering.api
build:
context: .
dockerfile: src/Services/Ordering/Ordering.API/Dockerfile
Expand All @@ -85,7 +105,11 @@ services:
- ordering-api

payment-api:
image: ${REGISTRY:-eshopdapr}/payment.api:${TAG:-latest}
# #Pulling the image from dockerhub of eshopdapr can speed up the generation, but the local modification will not take effect
# image: ${REGISTRY:-eshopdapr}/payment.api:${TAG:-latest}
# # or
# # Using local code to build a docker image is slow
image: ${REGISTRY:-}/payment.api
build:
context: .
dockerfile: src/Services/Payment/Payment.API/Dockerfile
Expand All @@ -97,7 +121,11 @@ services:
- payment-api

webshoppingagg:
image: ${REGISTRY:-eshopdapr}/webshoppingagg:${TAG:-latest}
# #Pulling the image from dockerhub of eshopdapr can speed up the generation, but the local modification will not take effect
# image: ${REGISTRY:-eshopdapr}/webshoppingagg:${TAG:-latest}
# # or
# # Using local code to build a docker image is slow
image: ${REGISTRY:-}/webshoppingagg
build:
context: .
dockerfile: src/ApiGateways/Aggregators/Web.Shopping.HttpAggregator/Dockerfile
Expand All @@ -115,7 +143,11 @@ services:
- webshoppingagg

webshoppingapigw:
image: ${REGISTRY:-eshopdapr}/webshoppingapigw:${TAG:-latest}
# #Pulling the image from dockerhub of eshopdapr can speed up the generation, but the local modification will not take effect
# image: ${REGISTRY:-eshopdapr}/webshoppingapigw:${TAG:-latest}
# # or
# # Using local code to build a docker image is slow.
image: ${REGISTRY:-}/webshoppingapigw
build:
context: .
dockerfile: src/ApiGateways/Envoy/Dockerfile
Expand All @@ -127,7 +159,11 @@ services:
- webshoppingapigw

webstatus:
image: ${REGISTRY:-eshopdapr}/webstatus:${TAG:-latest}
# #Pulling the image from dockerhub of eshopdapr can speed up the generation, but the local modification will not take effect
# image: ${REGISTRY:-eshopdapr}/webstatus:${TAG:-latest}
# # or
# # Using local code to build a docker image is slow.
image: ${REGISTRY:-}/webstatus
build:
context: .
dockerfile: src/Web/WebStatus/Dockerfile
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public static void AddCustomSwagger(this WebApplicationBuilder builder)
TokenUrl = new Uri($"{identityUrlExternal}/connect/token"),
Scopes = new Dictionary<string, string>()
{
{ "shoppingaggr-api", AppName }
{ "shoppingaggr", AppName }
}
}
}
Expand Down