From 265594b6ef4d2eb98bb30a5bad33ab44b1cdeef0 Mon Sep 17 00:00:00 2001 From: Paul Yuknewicz Date: Wed, 10 Jan 2024 13:42:11 -0800 Subject: [PATCH 1/5] updating daprd & dapr containers to dapr 1.12.3 Signed-off-by: Paul Yuknewicz --- docker-compose.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6f86f403..278563eb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,7 +31,7 @@ services: - redis basket-api-dapr: - image: "daprio/daprd:1.9.4" + image: "daprio/daprd:1.12.3" network_mode: "service:basket-api" depends_on: - basket-api @@ -51,7 +51,7 @@ services: - sqldata catalog-api-dapr: - image: "daprio/daprd:1.9.4" + image: "daprio/daprd:1.12.3" network_mode: "service:catalog-api" depends_on: - catalog-api @@ -65,7 +65,7 @@ services: - sqldata identity-api-dapr: - image: "daprio/daprd:1.9.4" + image: "daprio/daprd:1.12.3" network_mode: "service:identity-api" depends_on: - identity-api @@ -79,7 +79,7 @@ services: - sqldata ordering-api-dapr: - image: "daprio/daprd:1.9.4" + image: "daprio/daprd:1.12.3" network_mode: "service:ordering-api" depends_on: - ordering-api @@ -91,7 +91,7 @@ services: dockerfile: src/Services/Payment/Payment.API/Dockerfile payment-api-dapr: - image: "daprio/daprd:1.9.4" + image: "daprio/daprd:1.12.3" network_mode: "service:payment-api" depends_on: - payment-api @@ -109,7 +109,7 @@ services: - sqldata webshoppingagg-dapr: - image: "daprio/daprd:1.9.4" + image: "daprio/daprd:1.12.3" network_mode: "service:webshoppingagg" depends_on: - webshoppingagg @@ -121,7 +121,7 @@ services: dockerfile: src/ApiGateways/Envoy/Dockerfile webshoppingapigw-dapr: - image: "daprio/daprd:1.9.4" + image: "daprio/daprd:1.12.3" network_mode: "service:webshoppingapigw" depends_on: - webshoppingapigw @@ -133,4 +133,4 @@ services: dockerfile: src/Web/WebStatus/Dockerfile dapr-placement: - image: "daprio/dapr:1.9.4" \ No newline at end of file + image: "daprio/dapr:1.12.3" \ No newline at end of file From c0c7989c6549a419297ebb1236f09a9b02328a25 Mon Sep 17 00:00:00 2001 From: Paul Yuknewicz Date: Wed, 10 Jan 2024 15:59:26 -0800 Subject: [PATCH 2/5] experiment: put placement on docker network and reference in CMD Signed-off-by: Paul Yuknewicz --- docker-compose.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 278563eb..759c5b0d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -122,6 +122,13 @@ services: webshoppingapigw-dapr: image: "daprio/daprd:1.12.3" + command: [ + "./daprd", + "--app-id", "webshoppingapigw", + "--app-port", "3000", + "--placement-host-address", "placement:50006", # Dapr's placement service can be reach via the docker DNS entry + "--resources-path", "./dapr/components" + ] network_mode: "service:webshoppingapigw" depends_on: - webshoppingapigw @@ -133,4 +140,7 @@ services: dockerfile: src/Web/WebStatus/Dockerfile dapr-placement: - image: "daprio/dapr:1.12.3" \ No newline at end of file + image: "daprio/dapr:1.12.3" + command: ["./placement", "--port", "50006"] + ports: + - "50006:50006" From f74d4f0f6035c5b280b22fedbaa356eabf1fd7ee Mon Sep 17 00:00:00 2001 From: Paul Yuknewicz Date: Wed, 10 Jan 2024 16:02:10 -0800 Subject: [PATCH 3/5] updating line 129 with new dns name Signed-off-by: Paul Yuknewicz --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 759c5b0d..184ebe75 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -126,7 +126,7 @@ services: "./daprd", "--app-id", "webshoppingapigw", "--app-port", "3000", - "--placement-host-address", "placement:50006", # Dapr's placement service can be reach via the docker DNS entry + "--placement-host-address", "dapr-placement:50006", # Dapr's placement service can be reach via the docker DNS entry "--resources-path", "./dapr/components" ] network_mode: "service:webshoppingapigw" From 38658094c14109629eaf75786b686bee9dedc55a Mon Sep 17 00:00:00 2001 From: Paul Yuknewicz Date: Wed, 10 Jan 2024 17:22:36 -0800 Subject: [PATCH 4/5] Reverting to dapr 1.12.0 avoiding Rabbit errors in daprd Signed-off-by: Paul Yuknewicz --- docker-compose.yml | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 184ebe75..49d81037 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,7 +31,7 @@ services: - redis basket-api-dapr: - image: "daprio/daprd:1.12.3" + image: "daprio/dapr:1.12.0" network_mode: "service:basket-api" depends_on: - basket-api @@ -51,7 +51,7 @@ services: - sqldata catalog-api-dapr: - image: "daprio/daprd:1.12.3" + image: "daprio/dapr:1.12.0" network_mode: "service:catalog-api" depends_on: - catalog-api @@ -65,7 +65,7 @@ services: - sqldata identity-api-dapr: - image: "daprio/daprd:1.12.3" + image: "daprio/dapr:1.12.0" network_mode: "service:identity-api" depends_on: - identity-api @@ -79,7 +79,7 @@ services: - sqldata ordering-api-dapr: - image: "daprio/daprd:1.12.3" + image: "daprio/dapr:1.12.0" network_mode: "service:ordering-api" depends_on: - ordering-api @@ -91,7 +91,7 @@ services: dockerfile: src/Services/Payment/Payment.API/Dockerfile payment-api-dapr: - image: "daprio/daprd:1.12.3" + image: "daprio/dapr:1.12.0" network_mode: "service:payment-api" depends_on: - payment-api @@ -109,7 +109,7 @@ services: - sqldata webshoppingagg-dapr: - image: "daprio/daprd:1.12.3" + image: "daprio/dapr:1.12.0" network_mode: "service:webshoppingagg" depends_on: - webshoppingagg @@ -121,14 +121,7 @@ services: dockerfile: src/ApiGateways/Envoy/Dockerfile webshoppingapigw-dapr: - image: "daprio/daprd:1.12.3" - command: [ - "./daprd", - "--app-id", "webshoppingapigw", - "--app-port", "3000", - "--placement-host-address", "dapr-placement:50006", # Dapr's placement service can be reach via the docker DNS entry - "--resources-path", "./dapr/components" - ] + image: "daprio/dapr:1.12.0" network_mode: "service:webshoppingapigw" depends_on: - webshoppingapigw @@ -140,7 +133,4 @@ services: dockerfile: src/Web/WebStatus/Dockerfile dapr-placement: - image: "daprio/dapr:1.12.3" - command: ["./placement", "--port", "50006"] - ports: - - "50006:50006" + image: "daprio/dapr:1.12.0" From 446052611a0ace0f8414406b108d7c9ae66b48f3 Mon Sep 17 00:00:00 2001 From: Paul Yuknewicz Date: Wed, 10 Jan 2024 17:31:47 -0800 Subject: [PATCH 5/5] updating to use ghcr.io registry to bypass typical rate limits Signed-off-by: Paul Yuknewicz --- docker-compose.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 49d81037..0d1c66a1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,7 +31,7 @@ services: - redis basket-api-dapr: - image: "daprio/dapr:1.12.0" + image: "ghcr.io/dapr/dapr:1.12.0" network_mode: "service:basket-api" depends_on: - basket-api @@ -51,7 +51,7 @@ services: - sqldata catalog-api-dapr: - image: "daprio/dapr:1.12.0" + image: "ghcr.io/dapr/dapr:1.12.0" network_mode: "service:catalog-api" depends_on: - catalog-api @@ -65,7 +65,7 @@ services: - sqldata identity-api-dapr: - image: "daprio/dapr:1.12.0" + image: "ghcr.io/dapr/dapr:1.12.0" network_mode: "service:identity-api" depends_on: - identity-api @@ -79,7 +79,7 @@ services: - sqldata ordering-api-dapr: - image: "daprio/dapr:1.12.0" + image: "ghcr.io/dapr/dapr:1.12.0" network_mode: "service:ordering-api" depends_on: - ordering-api @@ -91,7 +91,7 @@ services: dockerfile: src/Services/Payment/Payment.API/Dockerfile payment-api-dapr: - image: "daprio/dapr:1.12.0" + image: "ghcr.io/dapr/dapr:1.12.0" network_mode: "service:payment-api" depends_on: - payment-api @@ -109,7 +109,7 @@ services: - sqldata webshoppingagg-dapr: - image: "daprio/dapr:1.12.0" + image: "ghcr.io/dapr/dapr:1.12.0" network_mode: "service:webshoppingagg" depends_on: - webshoppingagg @@ -121,7 +121,7 @@ services: dockerfile: src/ApiGateways/Envoy/Dockerfile webshoppingapigw-dapr: - image: "daprio/dapr:1.12.0" + image: "ghcr.io/dapr/dapr:1.12.0" network_mode: "service:webshoppingapigw" depends_on: - webshoppingapigw @@ -133,4 +133,4 @@ services: dockerfile: src/Web/WebStatus/Dockerfile dapr-placement: - image: "daprio/dapr:1.12.0" + image: "ghcr.io/dapr/dapr:1.12.0"