diff --git a/.circleci/images/primary/Dockerfile-3.1.1 b/.circleci/images/primary/Dockerfile-3.1.2 similarity index 97% rename from .circleci/images/primary/Dockerfile-3.1.1 rename to .circleci/images/primary/Dockerfile-3.1.2 index cf27e09a94d..3112b8ae7b5 100644 --- a/.circleci/images/primary/Dockerfile-3.1.1 +++ b/.circleci/images/primary/Dockerfile-3.1.2 @@ -1,4 +1,4 @@ -FROM ruby:3.1.1-bullseye +FROM ruby:3.1.2-bullseye # Make apt non-interactive RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90circleci \ @@ -48,7 +48,6 @@ RUN COMPOSE_URL="https://github.com/linuxserver/docker-docker-compose/releases/d RUN curl -sfL $(curl -s https://api.github.com/repos/powerman/dockerize/releases/latest | grep -i /dockerize-$(uname -s)-$(dpkg --print-architecture)\" | cut -d\" -f4) | install /dev/stdin /usr/local/bin/dockerize # Install RubyGems -RUN gem update --system RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME" # Upgrade RubyGems and Bundler diff --git a/.github/workflows/build-ruby.yml b/.github/workflows/build-ruby.yml index 7f41ed35591..9dae779746b 100644 --- a/.github/workflows/build-ruby.yml +++ b/.github/workflows/build-ruby.yml @@ -46,8 +46,8 @@ jobs: version: 3.0.4 dockerfile: Dockerfile-3.0.4 - engine: ruby - version: 3.1.1 - dockerfile: Dockerfile-3.1.1 + version: 3.1.2 + dockerfile: Dockerfile-3.1.2 - engine: ruby version: 3.2.0-preview3 dockerfile: Dockerfile-3.2.0-preview3 diff --git a/docker-compose.yml b/docker-compose.yml index 0603f2bbf10..9f99899251a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -202,7 +202,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.1-dd + image: ghcr.io/datadog/dd-trace-rb/ruby:3.1.2-dd command: /bin/bash depends_on: - ddagent