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

Use ghrc.io/datadog/images-rb as base #3737

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Use ghrc.io/datadog/images-rb as base #3737

wants to merge 1 commit into from
+11 −364

Conversation

lloeki
Copy link
Contributor

@lloeki lloeki commented Jun 25, 2024 •
edited
Loading

What does this PR do?

Start using images from ghrc.io/datadog/images-rb

Motivation:

  • Centralise image management across Ruby repositories
  • Decouple image generation from this repository, which causes conundrums such as in this very PR: to make use of the new images this PR must be merged without actually making use of the images in the actual CI, then a public workflow to publish the images must be triggered, and finally a second PR must be opened to actually make use of the new images.

Additional Notes:

  • Part of the CI being in CircleCI makes it annoying: I can't even hack something where the image build would happen and CircleCI would use those.
  • The integration tests are especially annoying as well, with some additional docker-compose stuff inside Docker.

How to test the change?

Hard.

@lloeki lloeki requested a review from a team as a code owner June 25, 2024 16:08
@lloeki lloeki marked this pull request as draft June 25, 2024 16:08
@github-actions github-actions bot added the dev/ci Involves CircleCI, GitHub Actions, or GitLab label Jun 25, 2024
marcotc
marcotc reviewed Jun 25, 2024
View reviewed changes
.circleci/images/primary/Dockerfile-2.5.9
&& echo 'DPkg::Options "--force-confnew";' >> /etc/apt/apt.conf.d/90circleci

ENV DEBIAN_FRONTEND=noninteractive
FROM ghcr.io/datadog/images-rb/engines/ruby:2.5
Copy link
Member

Choose a reason for hiding this comment

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

I'm curious: where's the source for these ghcr.io/datadog/images-rb/engines/ruby images?

Copy link
Contributor

Choose a reason for hiding this comment

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

Here: https://github.com/DataDog/images-rb

TonyCTHsu
TonyCTHsu reviewed Jun 26, 2024
View reviewed changes
.circleci/images/primary/Dockerfile-jruby-9.3.9.0
&& echo 'DPkg::Options "--force-confnew";' >> /etc/apt/apt.conf.d/90circleci

ENV DEBIAN_FRONTEND=noninteractive
FROM ghcr.io/datadog/images-rb/engines/jruby:9.2
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
FROM ghcr.io/datadog/images-rb/engines/jruby:9.2
FROM ghcr.io/datadog/images-rb/engines/jruby:9.3

.circleci/images/primary/Dockerfile-jruby-9.4.7.0
&& echo 'DPkg::Options "--force-confnew";' >> /etc/apt/apt.conf.d/90circleci

ENV DEBIAN_FRONTEND=noninteractive
FROM ghcr.io/datadog/images-rb/engines/jruby:9.2
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
FROM ghcr.io/datadog/images-rb/engines/jruby:9.2
FROM ghcr.io/datadog/images-rb/engines/jruby:9.4

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TonyCTHsu TonyCTHsu TonyCTHsu left review comments

@marcotc marcotc marcotc left review comments

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
dev/ci Involves CircleCI, GitHub Actions, or GitLab
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lloeki @marcotc @TonyCTHsu