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.

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

fix: combine the docker-compose files #3169

Merged
merged 11 commits into from
Jun 18, 2024
Merged

fix: combine the docker-compose files #3169

merged 11 commits into from
Jun 18, 2024

Conversation

Revathyvenugopal162
Copy link
Contributor

@Revathyvenugopal162 Revathyvenugopal162 commented Jun 13, 2024

Description

This PR merges three separate Docker Compose files into a single Docker Compose file containing three distinct services: mapdl, dpf, and mapdl-local.

To start a specific service, use the following command:

docker-compose up -d <service_name>

For example, to start the mapdl service, run:

docker-compose up -d mapdl

This consolidation simplifies the management and orchestration of our Docker services, making it easier to start, stop, and manage the individual components as needed.

@ansys-reviewer-bot
Copy link
Contributor

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

@ansys-reviewer-bot review

@github-actions github-actions bot added CI/CD Related with CICD, Github Actions, etc BUG labels Jun 13, 2024
Copy link

codecov bot commented Jun 13, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 63.22%. Comparing base (7c1eb1e) to head (b679524).
Report is 8 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff             @@
##             main    #3169       +/-   ##
===========================================
- Coverage   86.63%   63.22%   -23.42%     
===========================================
  Files          52       52               
  Lines        9550     9596       +46     
===========================================
- Hits         8274     6067     -2207     
- Misses       1276     3529     +2253     

@Revathyvenugopal162 Revathyvenugopal162 marked this pull request as ready for review June 14, 2024 13:18
@Revathyvenugopal162 Revathyvenugopal162 requested a review from a team as a code owner June 14, 2024 13:18
@germa89
Copy link
Collaborator

germa89 commented Jun 17, 2024

Hi @Revathyvenugopal162

Thank you a lot for this PR! You make thought and google a bit... it seems now docker-compose supports "profiles".

https://docs.docker.com/compose/profiles/?highlight=profile

I will take the freedom to modify your PR to adapt to those profiles.

Docker Documentation

@Revathyvenugopal162
Copy link
Contributor Author

Revathyvenugopal162 commented Jun 17, 2024

Hi @Revathyvenugopal162

Thank you a lot for this PR! You make thought and google a bit... it seems now docker-compose supports "profiles".

https://docs.docker.com/compose/profiles/?highlight=profile

I will take the freedom to modify your PR to adapt to those profiles.

Docker Documentation**Using profiles with Compose**

sure, no problem

Docker Documentation

Forcing to use a service name or profile. There is no default because `mapdl` and `mapdl-local` are both excluding.
Copy link
Collaborator

@germa89 germa89 left a comment

Choose a reason for hiding this comment

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

LGTM! Thank you a lot @Revathyvenugopal162 for this.

.gitignore Outdated Show resolved Hide resolved
.gitignore Outdated Show resolved Hide resolved
@Revathyvenugopal162
Copy link
Contributor Author

Thanks @germa89 , i will merge the PR if its ok (pinging @jorgepiloto ) once the workflow finishes.

@germa89 germa89 enabled auto-merge (squash) June 18, 2024 11:46
@germa89 germa89 merged commit 91a7cdd into main Jun 18, 2024
35 of 36 checks passed
@germa89 germa89 deleted the fix/docker-compose branch June 18, 2024 11:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/CD Related with CICD, Github Actions, etc
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants