Merge pull request #198 from DataDog/tonycthsu/images

Use images from images-rb
DataDog · Jul 9, 2024 · 579867e · 579867e
2 parents ef4a668 + 55beaae
commit 579867e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 27 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -33,7 +33,6 @@ test_containers:
     JRUBY_OPTS: --dev
   - &container_parameters_environment
     - *container_base_environment
-    - TEST_DATADOG_INTEGRATION: 1
     - COVERAGE_BASE_DIR: coverage
   - &container_base
     image: <<parameters.image>>
@@ -277,37 +276,37 @@ job_configuration:
   # MRI
   - &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'
+    image: ghcr.io/datadog/images-rb/engines/ruby:2.7
     resource_class_to_use: medium+
   - &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
+    ruby_version: 'ruby-3.0'
+    image: ghcr.io/datadog/images-rb/engines/ruby:3.0
     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
+    ruby_version: 'ruby-3.1'
+    image: ghcr.io/datadog/images-rb/engines/ruby:3.1
     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
+    ruby_version: 'ruby-3.2'
+    image: ghcr.io/datadog/images-rb/engines/ruby:3.2
     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
+    ruby_version: 'ruby-3.3'
+    image: ghcr.io/datadog/images-rb/engines/ruby:3.3
     resource_class_to_use: medium+
   - &config-3_2-small
     <<: *config-3_2
     resource_class_to_use: small
     # ADD NEW RUBIES HERE
   - &config-jruby-9_4
     <<: *filters_all_branches_and_tags
-    ruby_version: 'jruby-9.4.7.0'
-    image: ghcr.io/datadog/dd-trace-rb/jruby:9.4.7.0-dd
+    ruby_version: 'jruby-9.4'
+    image: ghcr.io/datadog/images-rb/engines/jruby:9.4
     resource_class_to_use: medium+
 
 workflows:

diff --git a/.circleci/images/primary/binary_version b/.circleci/images/primary/binary_version
@@ -1 +1 @@
-2
+ca1182d0e22ebb43c75b3771e56072fe
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,58 +1,59 @@
 services:
   # MRI
   datadog-ci-2.7:
-    image: ghcr.io/datadog/dd-trace-rb/ruby:2.7.6-dd
+    image: ghcr.io/datadog/images-rb/engines/ruby:2.7
+    working_dir: /app
     command: /bin/bash
     env_file: ./.env
-    environment: &common-environment
+    environment:
       BUNDLE_GEMFILE: /app/Gemfile-2.7
-      TEST_DATADOG_INTEGRATION: 1
     stdin_open: true
     tty: true
     volumes:
       - .:/app
       - bundle-2.7:/usr/local/bundle
   datadog-ci-3.0:
-    image: ghcr.io/datadog/dd-trace-rb/ruby:3.0.4-dd
+    image: ghcr.io/datadog/images-rb/engines/ruby:3.0
+    working_dir: /app
     command: /bin/bash
     env_file: ./.env
-    environment: &common-environment-3x
+    environment:
       BUNDLE_GEMFILE: /app/Gemfile-3.0
     stdin_open: true
     tty: true
     volumes:
       - .:/app
       - bundle-3.0:/usr/local/bundle
   datadog-ci-3.1:
-    image: ghcr.io/datadog/dd-trace-rb/ruby:3.1.2-dd
+    image: ghcr.io/datadog/images-rb/engines/ruby:3.1
+    working_dir: /app
     command: /bin/bash
     env_file: ./.env
     environment:
-      <<: *common-environment-3x
       BUNDLE_GEMFILE: /app/Gemfile-3.1
     stdin_open: true
     tty: true
     volumes:
       - .:/app
       - bundle-3.1:/usr/local/bundle
   datadog-ci-3.2:
-    image: ghcr.io/datadog/dd-trace-rb/ruby:3.2.0-dd
+    image: ghcr.io/datadog/images-rb/engines/ruby:3.2
+    working_dir: /app
     command: /bin/bash
     env_file: ./.env
     environment:
-      <<: *common-environment-3x
       BUNDLE_GEMFILE: /app/Gemfile-3.2
     stdin_open: true
     tty: true
     volumes:
       - .:/app
       - bundle-3.2:/usr/local/bundle
   datadog-ci-3.3:
-    image: ghcr.io/datadog/dd-trace-rb/ruby:3.3.0-dd
+    image: ghcr.io/datadog/images-rb/engines/ruby:3.3
+    working_dir: /app
     command: /bin/bash
     env_file: ./.env
     environment:
-      <<: *common-environment-3x
       BUNDLE_GEMFILE: /app/Gemfile-3.3
     stdin_open: true
     tty: true
@@ -61,11 +62,11 @@ services:
       - bundle-3.3:/usr/local/bundle
   # ADD NEW RUBIES HERE
   datadog-ci-jruby-9.4:
-    image: ghcr.io/datadog/dd-trace-rb/jruby:9.4.7.0-dd
+    image: ghcr.io/datadog/images-rb/engines/jruby:9.4
+    working_dir: /app
     command: /bin/bash
     env_file: ./.env
     environment:
-      <<: *common-environment
       BUNDLE_GEMFILE: /app/Gemfile-jruby-9.4
     stdin_open: true
     tty: true