Skip to content

Commit 8e44c3a

Browse files
authored
[chore] - update dependent services to latest stable (#1301)
* update service dependencies Signed-off-by: Pierre Tessier <[email protected]> * update service dependencies Signed-off-by: Pierre Tessier <[email protected]> * fix lint Signed-off-by: Pierre Tessier <[email protected]> --------- Signed-off-by: Pierre Tessier <[email protected]>
1 parent 430b4c9 commit 8e44c3a

File tree

2 files changed

+10
-164
lines changed

2 files changed

+10
-164
lines changed

docker-compose.minimal.yml

+5-159
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ services:
445445
# ******************
446446
# Redis used by Cart service
447447
redis-cart:
448-
image: redis:alpine
448+
image: redis:7.2-alpine
449449
container_name: redis-cart
450450
user: redis
451451
deploy:
@@ -463,7 +463,7 @@ services:
463463
# ********************
464464
# Jaeger
465465
jaeger:
466-
image: jaegertracing/all-in-one:1.51
466+
image: jaegertracing/all-in-one:1.52
467467
container_name: jaeger
468468
command:
469469
- "--memory.max-traces=8000"
@@ -485,7 +485,7 @@ services:
485485

486486
# Grafana
487487
grafana:
488-
image: grafana/grafana:10.2.0
488+
image: grafana/grafana:10.2.2
489489
container_name: grafana
490490
deploy:
491491
resources:
@@ -502,7 +502,7 @@ services:
502502

503503
# OpenTelemetry Collector
504504
otelcol:
505-
image: otel/opentelemetry-collector-contrib:0.88.0
505+
image: otel/opentelemetry-collector-contrib:0.91.0
506506
container_name: otel-col
507507
deploy:
508508
resources:
@@ -524,7 +524,7 @@ services:
524524

525525
# Prometheus
526526
prometheus:
527-
image: quay.io/prometheus/prometheus:v2.47.2
527+
image: quay.io/prometheus/prometheus:v2.48.1
528528
container_name: prometheus
529529
command:
530530
- --web.console.templates=/etc/prometheus/consoles
@@ -576,157 +576,3 @@ services:
576576
ports:
577577
- "21892"
578578
logging: *logging
579-
580-
# *****
581-
# Tests
582-
# *****
583-
# Frontend Tests
584-
frontendTests:
585-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-frontend-tests
586-
container_name: frontend-tests
587-
build:
588-
context: ./
589-
dockerfile: ./src/frontend/Dockerfile.cypress
590-
profiles:
591-
- tests
592-
volumes:
593-
- ./src/frontend/cypress/videos:/app/cypress/videos
594-
- ./src/frontend/cypress/screenshots:/app/cypress/screenshots
595-
environment:
596-
- CYPRESS_baseUrl=http://${FRONTEND_ADDR}
597-
- FRONTEND_ADDR
598-
- NODE_ENV=production
599-
depends_on:
600-
- frontend
601-
602-
# Integration Tests
603-
integrationTests:
604-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-integrationTests
605-
container_name: integrationTests
606-
profiles:
607-
- tests
608-
build:
609-
context: ./
610-
dockerfile: ./test/Dockerfile
611-
environment:
612-
- AD_SERVICE_ADDR
613-
- CART_SERVICE_ADDR
614-
- CHECKOUT_SERVICE_ADDR
615-
- CURRENCY_SERVICE_ADDR
616-
- EMAIL_SERVICE_ADDR
617-
- PAYMENT_SERVICE_ADDR
618-
- PRODUCT_CATALOG_SERVICE_ADDR
619-
- RECOMMENDATION_SERVICE_ADDR
620-
- SHIPPING_SERVICE_ADDR
621-
depends_on:
622-
- adservice
623-
- cartservice
624-
- checkoutservice
625-
- currencyservice
626-
- emailservice
627-
- paymentservice
628-
- productcatalogservice
629-
- recommendationservice
630-
- shippingservice
631-
- quoteservice
632-
633-
# Tracebased Tests
634-
traceBasedTests:
635-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-traceBasedTests
636-
container_name: traceBasedTests
637-
profiles:
638-
- tests
639-
build:
640-
context: ./
641-
dockerfile: ./test/tracetesting/Dockerfile
642-
args:
643-
- TRACETEST_IMAGE_VERSION
644-
environment:
645-
- AD_SERVICE_ADDR
646-
- CART_SERVICE_ADDR
647-
- CHECKOUT_SERVICE_ADDR
648-
- CURRENCY_SERVICE_ADDR
649-
- EMAIL_SERVICE_ADDR
650-
- FRONTEND_ADDR
651-
- PAYMENT_SERVICE_ADDR
652-
- PRODUCT_CATALOG_SERVICE_ADDR
653-
- RECOMMENDATION_SERVICE_ADDR
654-
- SHIPPING_SERVICE_ADDR
655-
- KAFKA_SERVICE_ADDR
656-
extra_hosts:
657-
- "host.docker.internal:host-gateway"
658-
depends_on:
659-
tracetest-server:
660-
condition: service_healthy
661-
# adding demo services as dependencies
662-
frontend:
663-
condition: service_started
664-
adservice:
665-
condition: service_started
666-
cartservice:
667-
condition: service_started
668-
checkoutservice:
669-
condition: service_started
670-
currencyservice:
671-
condition: service_started
672-
emailservice:
673-
condition: service_started
674-
paymentservice:
675-
condition: service_started
676-
productcatalogservice:
677-
condition: service_started
678-
recommendationservice:
679-
condition: service_started
680-
shippingservice:
681-
condition: service_started
682-
quoteservice:
683-
condition: service_started
684-
accountingservice:
685-
condition: service_started
686-
frauddetectionservice:
687-
condition: service_started
688-
689-
tracetest-server:
690-
image: kubeshop/tracetest:v0.14.6
691-
platform: linux/amd64
692-
container_name: tracetest-server
693-
profiles:
694-
- tests
695-
volumes:
696-
- type: bind
697-
source: ./test/tracetesting/tracetest-config.yaml
698-
target: /app/tracetest.yaml
699-
- type: bind
700-
source: ./test/tracetesting/tracetest-provision.yaml
701-
target: /app/provision.yaml
702-
command: --provisioning-file /app/provision.yaml
703-
ports:
704-
- 11633:11633
705-
extra_hosts:
706-
- "host.docker.internal:host-gateway"
707-
depends_on:
708-
tracetest-postgres:
709-
condition: service_healthy
710-
otelcol:
711-
condition: service_started
712-
healthcheck:
713-
test: [ "CMD", "wget", "--spider", "localhost:11633" ]
714-
interval: 1s
715-
timeout: 3s
716-
retries: 60
717-
718-
tracetest-postgres:
719-
image: postgres:16.0
720-
container_name: tracetest-postgres
721-
profiles:
722-
- tests
723-
environment:
724-
POSTGRES_PASSWORD: postgres
725-
POSTGRES_USER: postgres
726-
healthcheck:
727-
test: pg_isready -U "$$POSTGRES_USER" -d "$$POSTGRES_DB"
728-
interval: 1s
729-
timeout: 5s
730-
retries: 60
731-
ports:
732-
- 5432

docker-compose.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ services:
540540
# ******************
541541
# Postgres used by Feature Flag service
542542
ffs_postgres:
543-
image: postgres:16.0
543+
image: postgres:16.1
544544
container_name: postgres
545545
user: postgres
546546
deploy:
@@ -608,7 +608,7 @@ services:
608608
# ********************
609609
# Jaeger
610610
jaeger:
611-
image: jaegertracing/all-in-one:1.51
611+
image: jaegertracing/all-in-one:1.52
612612
container_name: jaeger
613613
command:
614614
- "--memory.max-traces=8000"
@@ -630,7 +630,7 @@ services:
630630

631631
# Grafana
632632
grafana:
633-
image: grafana/grafana:10.2.0
633+
image: grafana/grafana:10.2.2
634634
container_name: grafana
635635
deploy:
636636
resources:
@@ -647,7 +647,7 @@ services:
647647

648648
# OpenTelemetry Collector
649649
otelcol:
650-
image: otel/opentelemetry-collector-contrib:0.88.0
650+
image: otel/opentelemetry-collector-contrib:0.91.0
651651
container_name: otel-col
652652
deploy:
653653
resources:
@@ -669,7 +669,7 @@ services:
669669

670670
# Prometheus
671671
prometheus:
672-
image: quay.io/prometheus/prometheus:v2.47.2
672+
image: quay.io/prometheus/prometheus:v2.48.1
673673
container_name: prometheus
674674
command:
675675
- --web.console.templates=/etc/prometheus/consoles

0 commit comments

Comments
 (0)