Skip to content
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

(chore) update dependency versions #1146

Merged
merged 4 commits into from
Sep 28, 2023
Merged

(chore) update dependency versions #1146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5356c6b
update dependency versions
puckpuck Sep 28, 2023
d197c61
update dependency versions
puckpuck Sep 28, 2023
d530e0b
update dependency versions
puckpuck Sep 28, 2023
f3cf118
update dependency versions
puckpuck Sep 28, 2023
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ release.
([#1121](https://github.com/open-telemetry/opentelemetry-demo/pull/1121))
* [kafka frauddetection adservice] update java agent versions
([#1132](https://github.com/open-telemetry/opentelemetry-demo/pull/1132))
* update dependent components to latest versions
([#1146](https://github.com/open-telemetry/opentelemetry-demo/pull/1146))

## 1.5.0

Expand Down
4 changes: 4 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ install-tools: $(MISSPELL)
npm install
@echo "All tools installed"

.PHONY: build
build:
docker compose build

.PHONY: build-and-push-dockerhub
build-and-push-dockerhub:
docker compose --env-file .dockerhub.env -f docker-compose.yml build
Expand Down
18 changes: 9 additions & 9 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ services:
# ******************
# Postgres used by Feature Flag service
ffs_postgres:
image: postgres:14
image: postgres:16.0
container_name: postgres
user: postgres
deploy:
Expand Down Expand Up @@ -589,7 +589,7 @@ services:

# Redis used by Cart service
redis-cart:
image: redis:alpine
image: redis:7.2-alpine
container_name: redis-cart
user: redis
deploy:
Expand All @@ -607,11 +607,11 @@ services:
# ********************
# Jaeger
jaeger:
image: jaegertracing/all-in-one:1.48.0
image: jaegertracing/all-in-one:1.49
container_name: jaeger
command:
- "--memory.max-traces"
- "10000"
- "8000"
- "--query.base-path"
- "/jaeger/ui"
- "--prometheus.server-url"
Expand All @@ -631,7 +631,7 @@ services:

# Grafana
grafana:
image: grafana/grafana:10.1.0
image: grafana/grafana:10.1.2
container_name: grafana
deploy:
resources:
Expand All @@ -646,7 +646,7 @@ services:

# OpenTelemetry Collector
otelcol:
image: otel/opentelemetry-collector-contrib:0.84.0
image: otel/opentelemetry-collector-contrib:0.86.0
container_name: otel-col
deploy:
resources:
Expand All @@ -669,7 +669,7 @@ services:

# Prometheus
prometheus:
image: quay.io/prometheus/prometheus:v2.46.0
image: quay.io/prometheus/prometheus:v2.47.0
container_name: prometheus
command:
- --web.console.templates=/etc/prometheus/consoles
Expand Down Expand Up @@ -798,7 +798,7 @@ services:
condition: service_started

tracetest-server:
image: kubeshop/tracetest:latest
image: kubeshop/tracetest:v0.13.10
platform: linux/amd64
container_name: tracetest-server
profiles:
Expand Down Expand Up @@ -827,7 +827,7 @@ services:
retries: 60

tracetest-postgres:
image: postgres:14
image: postgres:16.0
container_name: tracetest-postgres
profiles:
- tests
Expand Down
2 changes: 1 addition & 1 deletion src/frontendproxy/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0


FROM envoyproxy/envoy-dev:8c202194ac6a2cb781eb6ce27d924b379b1e787f
FROM envoyproxy/envoy:v1.27-latest
RUN apt-get update && apt-get install -y gettext-base && apt-get clean && rm -rf /var/lib/apt/lists/*

USER envoy
Expand Down
2 changes: 1 addition & 1 deletion src/kafka/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0


FROM confluentinc/cp-kafka:latest-ubi8
FROM confluentinc/cp-kafka:7.5.0

USER root
ARG version=1.30.0
Expand Down
Loading