-
Notifications
You must be signed in to change notification settings - Fork 56
Create multiple docker images for fluent. One for solver and another with cad #321
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,23 @@ | ||
| ARG baseImage=centos:7 | ||
| FROM ${baseImage} as builder | ||
| COPY lnamd64.tgz /ansys_inc/ | ||
| RUN tar -xzf /ansys_inc/lnamd64.tgz --strip-components=2 --directory /ansys_inc/ && rm -f /ansys_inc/lnamd64.tgz | ||
| FROM ${baseImage} as fluentbuilder | ||
| COPY fluent.tgz /ansys_inc/ | ||
| RUN tar -xzf /ansys_inc/fluent.tgz --directory /ansys_inc/ && rm -f /ansys_inc/fluent.tgz | ||
|
|
||
| FROM ${baseImage} as ceibuilder | ||
| COPY cei.tgz /ansys_inc/ | ||
| RUN tar -xzf /ansys_inc/cei.tgz --directory /ansys_inc/ && rm -f /ansys_inc/cei.tgz | ||
|
|
||
| FROM ${baseImage} | ||
| LABEL description="Ansys Fluent 2022 R2" | ||
| MAINTAINER Laurence Janoo "laurence.janoo@ansys.com" | ||
| RUN yum install -y \ | ||
| tcsh.x86_64 \ | ||
| libXrandr.x86_64 \ | ||
| libXinerama.x86_64 \ | ||
| libXcursor.x86_64 \ | ||
| mesa-libGLU-9.0.0-4.el7.x86_64 \ | ||
| libglvnd-glx-1.0.1-0.8.git5baa1e5.el7.x86_64 \ | ||
| libglvnd-1.0.1-0.8.git5baa1e5.el7.x86_64 && yum clean all | ||
| COPY --from=builder /ansys_inc /ansys_inc/ | ||
| COPY --from=fluentbuilder /ansys_inc /ansys_inc/ | ||
| COPY --from=ceibuilder /ansys_inc /ansys_inc/ | ||
| ENTRYPOINT ["/ansys_inc/v222/fluent/bin/fluent"] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| ARG baseImage=centos:7 | ||
| FROM ${baseImage} as cadbuilder | ||
| COPY cad.tgz /ansys_inc/ | ||
| RUN tar -xzf /ansys_inc/cad.tgz --directory /ansys_inc/ && rm -f /ansys_inc/cad.tgz | ||
|
|
||
| FROM ghcr.io/pyansys/pyfluent-solver:latest AS fluent | ||
| WORKDIR /ansys_inc/ | ||
| COPY --from=cadbuilder /ansys_inc /ansys_inc/ | ||
| ENTRYPOINT ["/ansys_inc/v222/fluent/bin/fluent"] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| vNNN/meshing | ||
| vNNN/commonfiles/CAD | ||
| vNNN/aisol | ||
| vNNN/commonfiles/MainWin | ||
| vNNN/Framework | ||
| vNNN/commonfiles/registry | ||
| vNNN/tp/stdc++ | ||
| vNNN/tp/openssl |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| vNNN/CEI/BUILDINFO.txt | ||
| vNNN/CEI/apex222 | ||
| vNNN/CEI/bin | ||
| vNNN/CEI/ensight222lang | ||
| vNNN/CEI/nexus222 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| vNNN/licensingclient/linx64/ansyscl | ||
| vNNN/licensingclient/linx64/ansysli_util | ||
| shared_files/licensing/language/en-us/ansysli_msgs.xml | ||
| vNNN/commonfiles/APIP/bin/linx64/apip-standalone-service | ||
| vNNN/commonfiles/etc/ApipRC.xml | ||
| vNNN/commonfiles/images/splash.png | ||
| vNNN/commonfiles/images/ANSYS_blk_lrg.png | ||
| vNNN/commonfiles/images/ANSYS_wht_lrg.png | ||
| vNNN/commonfiles/images/academic_large_black.png | ||
| vNNN/commonfiles/images/academic_large_white.png | ||
| vNNN/commonfiles/images/splash.bmp | ||
| vNNN/commonfiles/globalsettings/ANSYSProductImprovementProgram.txt | ||
| vNNN/commonfiles/help/en-us/fluent_gui_help/ | ||
| vNNN/commonfiles/CPython/3_7/linx64/Release | ||
| vNNN/commonfiles/fluids | ||
| vNNN/tp/IntelCompiler/2019.3.199/linx64/lib/intel64/libifcoremt.so.5 | ||
| vNNN/tp/IntelCompiler/2019.3.199/linx64/lib/intel64/libifcore.so.5 | ||
| vNNN/tp/IntelCompiler/2019.3.199/linx64/lib/intel64/libifport.so.5 | ||
| vNNN/tp/IntelCompiler/2019.3.199/linx64/lib/intel64/libimf.so | ||
| vNNN/tp/IntelCompiler/2019.3.199/linx64/lib/intel64/libintlc.so.5 | ||
| vNNN/tp/IntelCompiler/2019.3.199/linx64/lib/intel64/libiomp5.so | ||
| vNNN/tp/IntelCompiler/2019.3.199/linx64/lib/intel64/libiomp5.dbg | ||
| vNNN/tp/IntelCompiler/2019.3.199/linx64/lib/intel64/libirc.so | ||
| vNNN/tp/IntelCompiler/2019.3.199/linx64/lib/intel64/libirng.so | ||
| vNNN/tp/IntelCompiler/2019.3.199/linx64/lib/intel64/libsvml.so | ||
| vNNN/tp/IntelMKL/2021.3.0/linx64/lib/intel64/libmkl_core.so.1 | ||
| vNNN/tp/IntelMKL/2021.3.0/linx64/lib/intel64/libmkl_def.so.1 | ||
| vNNN/tp/IntelMKL/2021.3.0/linx64/lib/intel64/libmkl_intel_lp64.so.1 | ||
| vNNN/tp/IntelMKL/2021.3.0/linx64/lib/intel64/libmkl_intel_thread.so.1 | ||
| vNNN/tp/IntelMKL/2021.3.0/linx64/lib/intel64/libmkl_sequential.so.1 | ||
| vNNN/tp/IntelMKL/2021.3.0/linx64/lib/intel64/libmkl_intel_ilp64.so.1 | ||
| vNNN/tp/IntelMKL/2021.3.0/linx64/lib/intel64/libmkl_avx2.so.1 | ||
| vNNN/tp/IntelMKL/2021.3.0/linx64/lib/intel64/libmkl_avx512.so.1 | ||
| vNNN/tp/7zip | ||
| vNNN/fluent |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Interesting, so is this taking the first image and incorporating here? If so, I think the ci config will need updating to pull this image.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. Using the solver image to add to it the cad piece.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You might need to update this:
https://github.com/pyansys/pyfluent/blob/6f11be964fd8db511f5e2b53a3b0f404b584a1b7/Makefile#L25
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I do not think I need to update this. The docker pull command will be installing ghcr.io/pyansys/pyfluent:latest which will be the fluent + nexus + cad ( full fluent )
docker should pull ghcr.io/pyansys/pyfluent-solver:latest which will be just fluent + nexus when installing the full fluent
Unless we want to have a Makefile for fluent-solver & fluent-solver + cad ( full fluent )
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, good and we can leave the makefile as it is.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Had a thought of creating docker images of the 3 tgz files ( cad, cei, fluent ) in github
Then have dockerfiles to create the images from the tgz images. Based on the 3 tgz files, we could create 3 images if we need to.
base fluent solver: fluent tgz image
base fluent solver + parametric: fluent + cei tgz images
base fluent solver + parametric + meshing: fluent + cei + cad tgz images
Wondering if there is any interest in this approach. I will not merge this PR if there is interest in this.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it would be ok but splitting out CEI probably only makes sense if we also deactivate the dependent part of the API. So, we would need to do both bits of work. I think you could leave it aside for now.