Skip to content

fix: update Dockerfiles and docker-compose files to use v25.2-ubuntu-cicd and streamline environment variables#3962

Merged
germa89 merged 2 commits intomainfrom
ci/updating-devcontainer-files-to-25.2
May 30, 2025
Merged

fix: update Dockerfiles and docker-compose files to use v25.2-ubuntu-cicd and streamline environment variables#3962
germa89 merged 2 commits intomainfrom
ci/updating-devcontainer-files-to-25.2

Conversation

@germa89
Copy link
Copy Markdown
Collaborator

@germa89 germa89 commented May 28, 2025 •
edited by sourcery-ai Bot
Loading

Description

As the title.

Issue linked

NA

Checklist

Summary by Sourcery

Update container configurations to use the latest v25.2-ubuntu-cicd image and simplify environment variable management

Enhancements:

  • Streamline environment variable handling by moving common flags into Dockerfiles

Build:

  • Bump base image to ghcr.io/ansys/mapdl:v25.2-ubuntu-cicd across all Dockerfiles
  • Remove hardcoded image and redundant environment settings from docker-compose configurations

@germa89 germa89 requested a review from a team as a code owner May 28, 2025 09:57
@ansys-reviewer-bot
Copy link
Copy Markdown
Contributor

ansys-reviewer-bot Bot commented May 28, 2025

Thanks for opening a Pull Request. If you want to perform a review write a comment saying:

@ansys-reviewer-bot review

@sourcery-ai
Copy link
Copy Markdown
Contributor

sourcery-ai Bot commented May 28, 2025 •
edited
Loading

Reviewer's Guide

This PR upgrades all devcontainer definitions to use the v25.2-ubuntu-cicd base image and streamlines environment variable handling by removing redundant vars from docker-compose files and centralizing them in the Dockerfiles.

File-Level Changes

Change Details Files
Upgraded base images to v25.2-ubuntu-cicd
  • Replaced FROM ghcr.io/ansys/mapdl:v24.1-ubuntu-student with v25.2-ubuntu-cicd in all Dockerfiles
 .devcontainer/codespaces-dev/Dockerfile
.devcontainer/codespaces-docs/Dockerfile
.devcontainer/devcontainer-local/Dockerfile
Removed static image references and redundant env vars from docker-compose
  • Deleted image: ghcr.io/ansys/mapdl:v24.1-ubuntu-student entries
  • Removed ON_CI, ON_LOCAL, ON_STUDENT, ON_UBUNTU environment blocks
 .devcontainer/devcontainer-local/docker-compose.yml
.devcontainer/codespaces-dev/docker-compose.yml
.devcontainer/codespaces-docs/docker-compose.yml
Centralized environment variable definitions in Dockerfiles
  • Added ENV ON_LOCAL=true, ON_UBUNTU=true, ON_CI=true to each Dockerfile
 .devcontainer/codespaces-dev/Dockerfile
.devcontainer/codespaces-docs/Dockerfile
.devcontainer/devcontainer-local/Dockerfile
Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@germa89 germa89 self-assigned this May 28, 2025
@github-actions github-actions Bot added CI/CD Related with CICD, Github Actions, etc bug Issue, problem or error in PyMAPDL labels May 28, 2025
sourcery-ai[bot]
sourcery-ai Bot reviewed May 28, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@sourcery-ai sourcery-ai Bot left a comment

Choose a reason for hiding this comment

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

Hey @germa89 - I've reviewed your changes - here's some feedback:

  • Hardcoding the v25.2-ubuntu-cicd tag in multiple Dockerfiles will require manual updates on future version bumps—consider using a build ARG or shared base Dockerfile to centralize the image version.
  • You’ve removed ON_STUDENT and ON_UBUNTU flags from docker-compose but added ON_CI/ON_LOCAL in Dockerfiles; double-check that any student- or Ubuntu-specific logic elsewhere still behaves correctly without those flags.
Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Documentation: all looks good
Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@germa89
Copy link
Copy Markdown
Collaborator Author

germa89 commented May 28, 2025

@pyansys-ci-bot LGTM.

pyansys-ci-bot
pyansys-ci-bot approved these changes May 28, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@pyansys-ci-bot pyansys-ci-bot left a comment

Choose a reason for hiding this comment

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

✅ Approving this PR because germa89 said so in here 😬

LGTM

@germa89 germa89 merged commit b48ff0c into main May 30, 2025
50 checks passed
@germa89 germa89 deleted the ci/updating-devcontainer-files-to-25.2 branch May 30, 2025 10:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sourcery-ai sourcery-ai[bot] sourcery-ai[bot] left review comments

@pyansys-ci-bot pyansys-ci-bot pyansys-ci-bot approved these changes

@clatapie clatapie Awaiting requested review from clatapie clatapie is a code owner automatically assigned from ansys/pymapdl-maintainers

Assignees

@germa89 germa89

Labels

bug Issue, problem or error in PyMAPDL CI/CD Related with CICD, Github Actions, etc

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@germa89 @pyansys-ci-bot