[chore] - update dependent services to latest stable (open-telemetry#…

…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]>
jmichalak9 · Dec 16, 2023 · b867732 · b867732
1 parent 4abdea1
commit b867732
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 164 deletions.
diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml
@@ -445,7 +445,7 @@ services:
   # ******************
   # Redis used by Cart service
   redis-cart:
-    image: redis:alpine
+    image: redis:7.2-alpine
     container_name: redis-cart
     user: redis
     deploy:
@@ -463,7 +463,7 @@ services:
   # ********************
   # Jaeger
   jaeger:
-    image: jaegertracing/all-in-one:1.51
+    image: jaegertracing/all-in-one:1.52
     container_name: jaeger
     command:
       - "--memory.max-traces=8000"
@@ -485,7 +485,7 @@ services:
 
   # Grafana
   grafana:
-    image: grafana/grafana:10.2.0
+    image: grafana/grafana:10.2.2
     container_name: grafana
     deploy:
       resources:
@@ -502,7 +502,7 @@ services:
 
   # OpenTelemetry Collector
   otelcol:
-    image: otel/opentelemetry-collector-contrib:0.88.0
+    image: otel/opentelemetry-collector-contrib:0.91.0
     container_name: otel-col
     deploy:
       resources:
@@ -524,7 +524,7 @@ services:
 
   # Prometheus
   prometheus:
-    image: quay.io/prometheus/prometheus:v2.47.2
+    image: quay.io/prometheus/prometheus:v2.48.1
     container_name: prometheus
     command:
       - --web.console.templates=/etc/prometheus/consoles
@@ -576,157 +576,3 @@ services:
     ports:
       - "21892"
     logging: *logging
-
-  # *****
-  # Tests
-  # *****
-  # Frontend Tests
-  frontendTests:
-    image: ${IMAGE_NAME}:${IMAGE_VERSION}-frontend-tests
-    container_name: frontend-tests
-    build:
-      context: ./
-      dockerfile: ./src/frontend/Dockerfile.cypress
-    profiles:
-      - tests
-    volumes:
-      - ./src/frontend/cypress/videos:/app/cypress/videos
-      - ./src/frontend/cypress/screenshots:/app/cypress/screenshots
-    environment:
-      - CYPRESS_baseUrl=http://${FRONTEND_ADDR}
-      - FRONTEND_ADDR
-      - NODE_ENV=production
-    depends_on:
-      - frontend
-
-  # Integration Tests
-  integrationTests:
-    image: ${IMAGE_NAME}:${IMAGE_VERSION}-integrationTests
-    container_name: integrationTests
-    profiles:
-      - tests
-    build:
-      context: ./
-      dockerfile: ./test/Dockerfile
-    environment:
-      - AD_SERVICE_ADDR
-      - CART_SERVICE_ADDR
-      - CHECKOUT_SERVICE_ADDR
-      - CURRENCY_SERVICE_ADDR
-      - EMAIL_SERVICE_ADDR
-      - PAYMENT_SERVICE_ADDR
-      - PRODUCT_CATALOG_SERVICE_ADDR
-      - RECOMMENDATION_SERVICE_ADDR
-      - SHIPPING_SERVICE_ADDR
-    depends_on:
-      - adservice
-      - cartservice
-      - checkoutservice
-      - currencyservice
-      - emailservice
-      - paymentservice
-      - productcatalogservice
-      - recommendationservice
-      - shippingservice
-      - quoteservice
-
-  # Tracebased Tests
-  traceBasedTests:
-    image: ${IMAGE_NAME}:${IMAGE_VERSION}-traceBasedTests
-    container_name: traceBasedTests
-    profiles:
-      - tests
-    build:
-      context: ./
-      dockerfile: ./test/tracetesting/Dockerfile
-      args:
-        - TRACETEST_IMAGE_VERSION
-    environment:
-      - AD_SERVICE_ADDR
-      - CART_SERVICE_ADDR
-      - CHECKOUT_SERVICE_ADDR
-      - CURRENCY_SERVICE_ADDR
-      - EMAIL_SERVICE_ADDR
-      - FRONTEND_ADDR
-      - PAYMENT_SERVICE_ADDR
-      - PRODUCT_CATALOG_SERVICE_ADDR
-      - RECOMMENDATION_SERVICE_ADDR
-      - SHIPPING_SERVICE_ADDR
-      - KAFKA_SERVICE_ADDR
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-    depends_on:
-      tracetest-server:
-        condition: service_healthy
-      # adding demo services as dependencies
-      frontend:
-        condition: service_started
-      adservice:
-        condition: service_started
-      cartservice:
-        condition: service_started
-      checkoutservice:
-        condition: service_started
-      currencyservice:
-        condition: service_started
-      emailservice:
-        condition: service_started
-      paymentservice:
-        condition: service_started
-      productcatalogservice:
-        condition: service_started
-      recommendationservice:
-        condition: service_started
-      shippingservice:
-        condition: service_started
-      quoteservice:
-        condition: service_started
-      accountingservice:
-        condition: service_started
-      frauddetectionservice:
-        condition: service_started
-
-  tracetest-server:
-    image: kubeshop/tracetest:v0.14.6
-    platform: linux/amd64
-    container_name: tracetest-server
-    profiles:
-      - tests
-    volumes:
-      - type: bind
-        source: ./test/tracetesting/tracetest-config.yaml
-        target: /app/tracetest.yaml
-      - type: bind
-        source: ./test/tracetesting/tracetest-provision.yaml
-        target: /app/provision.yaml
-    command: --provisioning-file /app/provision.yaml
-    ports:
-      - 11633:11633
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-    depends_on:
-      tracetest-postgres:
-        condition: service_healthy
-      otelcol:
-        condition: service_started
-    healthcheck:
-      test: [ "CMD", "wget", "--spider", "localhost:11633" ]
-      interval: 1s
-      timeout: 3s
-      retries: 60
-
-  tracetest-postgres:
-    image: postgres:16.0
-    container_name: tracetest-postgres
-    profiles:
-      - tests
-    environment:
-      POSTGRES_PASSWORD: postgres
-      POSTGRES_USER: postgres
-    healthcheck:
-      test: pg_isready -U "$$POSTGRES_USER" -d "$$POSTGRES_DB"
-      interval: 1s
-      timeout: 5s
-      retries: 60
-    ports:
-      - 5432
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -540,7 +540,7 @@ services:
   # ******************
   # Postgres used by Feature Flag service
   ffs_postgres:
-    image: postgres:16.0
+    image: postgres:16.1
     container_name: postgres
     user: postgres
     deploy:
@@ -608,7 +608,7 @@ services:
   # ********************
   # Jaeger
   jaeger:
-    image: jaegertracing/all-in-one:1.51
+    image: jaegertracing/all-in-one:1.52
     container_name: jaeger
     command:
       - "--memory.max-traces=8000"
@@ -630,7 +630,7 @@ services:
 
   # Grafana
   grafana:
-    image: grafana/grafana:10.2.0
+    image: grafana/grafana:10.2.2
     container_name: grafana
     deploy:
       resources:
@@ -647,7 +647,7 @@ services:
 
   # OpenTelemetry Collector
   otelcol:
-    image: otel/opentelemetry-collector-contrib:0.88.0
+    image: otel/opentelemetry-collector-contrib:0.91.0
     container_name: otel-col
     deploy:
       resources:
@@ -669,7 +669,7 @@ services:
 
   # Prometheus
   prometheus:
-    image: quay.io/prometheus/prometheus:v2.47.2
+    image: quay.io/prometheus/prometheus:v2.48.1
     container_name: prometheus
     command:
       - --web.console.templates=/etc/prometheus/consoles