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

Jump to bottom

Update docker image usage #3722

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update docker image usage #3722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
538fd27
Revert "Undo `docker-compose.yml` version bumps"
lloeki Jun 18, 2024
f51ac02
Update CircleCI to use bumped images
lloeki Jun 18, 2024
a3cb7b9
Bump binary version cache key
lloeki Jun 20, 2024
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
12 changes: 6 additions & 6 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,31 +454,31 @@ job_configuration:
resource_class_to_use: medium+
- &config-2_7
<<: *filters_all_branches_and_tags
ruby_version: 'ruby-2.7.6'
image: ghcr.io/datadog/dd-trace-rb/ruby:2.7.6-dd
ruby_version: 'ruby-2.7.8'
image: ghcr.io/datadog/dd-trace-rb/ruby:2.7.8-dd
resource_class_to_use: medium+
- &config-2_7-small
<<: *config-2_7
resource_class_to_use: small
- &config-3_0
<<: *filters_all_branches_and_tags
ruby_version: 'ruby-3.0.4'
image: ghcr.io/datadog/dd-trace-rb/ruby:3.0.4-dd
image: ghcr.io/datadog/dd-trace-rb/ruby:3.0.7-dd
resource_class_to_use: medium+
- &config-3_1
<<: *filters_all_branches_and_tags
ruby_version: 'ruby-3.1.2'
image: ghcr.io/datadog/dd-trace-rb/ruby:3.1.2-dd
image: ghcr.io/datadog/dd-trace-rb/ruby:3.1.6-dd
resource_class_to_use: medium+
- &config-3_2
<<: *filters_all_branches_and_tags
ruby_version: 'ruby-3.2.0'
image: ghcr.io/datadog/dd-trace-rb/ruby:3.2.0-dd
image: ghcr.io/datadog/dd-trace-rb/ruby:3.2.4-dd
resource_class_to_use: medium+
- &config-3_3
<<: *filters_all_branches_and_tags
ruby_version: 'ruby-3.3.0'
image: ghcr.io/datadog/dd-trace-rb/ruby:3.3.0-dd
image: ghcr.io/datadog/dd-trace-rb/ruby:3.3.2-dd
resource_class_to_use: medium+
# ADD NEW RUBIES HERE
- &config-jruby-9_2 # More recent release of 9.2
Expand Down
2 changes: 1 addition & 1 deletion .circleci/images/primary/binary_version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4
5
10 changes: 5 additions & 5 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ services:
- bundle-2.6:/usr/local/bundle
- "ddagent_var_run:${TEST_DDAGENT_VAR_RUN}"
tracer-2.7:
image: ghcr.io/datadog/dd-trace-rb/ruby:2.7.6-dd
image: ghcr.io/datadog/dd-trace-rb/ruby:2.7.8-dd
command: /bin/bash
depends_on:
- ddagent
Expand All @@ -89,7 +89,7 @@ services:
- bundle-2.7:/usr/local/bundle
- "ddagent_var_run:${TEST_DDAGENT_VAR_RUN}"
tracer-3.0:
image: ghcr.io/datadog/dd-trace-rb/ruby:3.0.4-dd
image: ghcr.io/datadog/dd-trace-rb/ruby:3.0.7-dd
command: /bin/bash
depends_on:
- ddagent
Expand Down Expand Up @@ -125,7 +125,7 @@ services:
- bundle-3.0:/usr/local/bundle
- "ddagent_var_run:${TEST_DDAGENT_VAR_RUN}"
tracer-3.1:
image: ghcr.io/datadog/dd-trace-rb/ruby:3.1.2-dd
image: ghcr.io/datadog/dd-trace-rb/ruby:3.1.6-dd
command: /bin/bash
depends_on:
- ddagent
Expand All @@ -150,7 +150,7 @@ services:
- bundle-3.1:/usr/local/bundle
- "ddagent_var_run:${TEST_DDAGENT_VAR_RUN}"
tracer-3.2:
image: ghcr.io/datadog/dd-trace-rb/ruby:3.2.0-dd
image: ghcr.io/datadog/dd-trace-rb/ruby:3.2.4-dd
command: /bin/bash
depends_on:
- ddagent
Expand All @@ -175,7 +175,7 @@ services:
- bundle-3.2:/usr/local/bundle
- "ddagent_var_run:${TEST_DDAGENT_VAR_RUN}"
tracer-3.3:
image: ghcr.io/datadog/dd-trace-rb/ruby:3.3.0-dd
image: ghcr.io/datadog/dd-trace-rb/ruby:3.3.2-dd
command: /bin/bash
depends_on:
- ddagent
Expand Down
Loading