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.

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] remove deprecated version property from docker compose files #1557

Merged

Conversation

puckpuck
Copy link
Contributor

Changes

Fixes: #1556, may also fix #1496

Docker deprecated and has not obsoleted the version property in docker compose files. This removes the property so the user doesn't receive a warning when starting/stopping the demo.

@puckpuck puckpuck requested a review from a team April 30, 2024 16:44
@github-actions github-actions bot added the helm-update-required Requires an update to the Helm chart when released label Apr 30, 2024
@puckpuck puckpuck removed the helm-update-required Requires an update to the Helm chart when released label Apr 30, 2024
Copy link
Member

@mviitane mviitane left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense. However, for some reason I don't see this error on Docker Desktop / macOS.

@github-actions github-actions bot added the helm-update-required Requires an update to the Helm chart when released label May 1, 2024
@puckpuck
Copy link
Contributor Author

puckpuck commented May 1, 2024

Makes sense. However, for some reason I don't see this error on Docker Desktop / macOS.

Which version of docker / Docker desktop are you running? This is what I get with docker version

Server: Docker Desktop 4.29.0 (145265)
 Engine:
  Version:          26.0.0
  API version:      1.45 (minimum version 1.24)
  Go version:       go1.21.8
  Git commit:       8b79278
  Built:            Wed Mar 20 15:18:02 2024
  OS/Arch:          linux/arm64
  Experimental:     false
 containerd:
  Version:          1.6.28
  GitCommit:        ae07eda36dd25f8a1b98dfbf587313b99c0190bb
 runc:
  Version:          1.1.12
  GitCommit:        v1.1.12-0-g51d5e94
 docker-init:
  Version:          0.19.0
  GitCommit:        de40ad0

@mviitane
Copy link
Member

mviitane commented May 2, 2024

Which version of docker / Docker desktop are you running? This is what I get with docker version

It seems I'm running a bit older version:

Server: Docker Desktop 4.28.0 (139021)
 Engine:
  Version:          25.0.3
  API version:      1.44 (minimum version 1.24)
  Go version:       go1.21.6
  Git commit:       f417435
  Built:            Tue Feb  6 21:14:22 2024
  OS/Arch:          linux/arm64
  Experimental:     false
 containerd:
  Version:          1.6.28
  GitCommit:        ae07eda36dd25f8a1b98dfbf587313b99c0190bb
 runc:
  Version:          1.1.12
  GitCommit:        v1.1.12-0-g51d5e94
 docker-init:
  Version:          0.19.0
  GitCommit:        de40ad0

@puckpuck puckpuck merged commit ab59acc into open-telemetry:main May 5, 2024
28 checks passed
@puckpuck puckpuck deleted the chore.remove-docker-compose-version branch May 5, 2024 22:22
maxhakansson added a commit to maxhakansson/opentelemetry-demo that referenced this pull request May 10, 2024
* main: (138 commits)
  docs: update sig meeting schedule (open-telemetry#1567)
  chore(deps): upgrade otel collector contrib and opensearch (open-telemetry#1566)
  fix(loadgenerator): use add_hooks openfeature method (open-telemetry#1565)
  Revert "remove axoflow link (open-telemetry#1457)" (open-telemetry#1563)
  feat: configure feature flag tracing for Python services (open-telemetry#1553)
  chore(deps): upgrade go dependencies to latest versions (open-telemetry#1561)
  remove deprecated version property (open-telemetry#1557)
  chore(deps): upgrade otel collector contrib, grafana and prometheus (open-telemetry#1559)
  add imageprovider (open-telemetry#1552)
  [flagd] - upgrade to latest version and memory limits (open-telemetry#1554)
  update kubernetes manifest to 1.9.0 (open-telemetry#1555)
  [chore] specify default value for tracetest image version (open-telemetry#1551)
  improve baggage propagation (open-telemetry#1545)
  Bump gradle/wrapper-validation-action from 3.3.1 to 3.3.2 (open-telemetry#1548)
  [kafka][checkoutservice][frauddetectionservice] add kafkaQueueProblems featureflag (open-telemetry#1528)
  fix(productcatalogservice): handle err returned from openfeature.SetProvider func (open-telemetry#1535)
  feat(otelcol): add redisreceiver (open-telemetry#1537)
  chore(deps): upgrade opentelemetry-java-instrumentation for kafka to 2.3.0 (open-telemetry#1533)
  Bump gradle/wrapper-validation-action from 3.3.0 to 3.3.1 (open-telemetry#1539)
  chore(deps): upgrade opentelemetry-java-instrumentation to 2.3.0 (open-telemetry#1532)
  ...

# Conflicts:
#	docker-compose.minimal.yml
#	src/frontend/package-lock.json
AlexPSplunk pushed a commit to splunk/edu-opentelemetry-demo that referenced this pull request Jul 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
helm-update-required Requires an update to the Helm chart when released
Projects
None yet
3 participants