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 docker build #357

Merged
merged 31 commits into from
Aug 22, 2024
Merged

fix docker build #357

merged 31 commits into from
Aug 22, 2024

Conversation

robkooper
Copy link
Contributor

  • push to dockerhub if setup
  • push to github
  • build arm (mac) container as well as x86

fixes #355

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Other (fix or feature that would cause existing functionality to change)

Checklist:

  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have added tests to cover my changes.

Testing :

  • All new and existing tests passed.

- push to dockerhub if setup
- push to github
- build arm (mac) container as well as x86
@robkooper robkooper marked this pull request as draft October 16, 2022 15:50
@robkooper
Copy link
Contributor Author

working on adding the intel compiler

@robkooper robkooper marked this pull request as ready for review March 28, 2023 11:39
@robkooper robkooper requested review from mpaiao and pmoorcroft March 28, 2023 11:40
@robkooper
Copy link
Contributor Author

Please squash the PR when ready, to many build errors and tries.

@robkooper robkooper marked this pull request as draft May 26, 2023 16:35
@robkooper
Copy link
Contributor Author

Will update this to also push the intermediate image with the build results to make it easier for others to build ED.

@robkooper
Copy link
Contributor Author

I have to figure out we this can be fixed.Right now it has 22GB of disk storage, but when pulling the intel image we are left with 900Mb, not enough to build the docker image.
I see this on my own machine as well, i go from 44GB free storage to 28GB.

Copy link
Contributor

@mpaiao mpaiao left a comment

Choose a reason for hiding this comment

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

Thanks for the updates, @robkooper! I think these look great. I just had one minor question about versions in the ci.yml file that may or may not be relevant.

.github/workflows/ci.yml Outdated Show resolved Hide resolved
MASTER_REPO: EDModel/ED2
DOCKERHUB_ORG: pecan
MAIN_REPO: EDmodel/ED2
DOCKERHUB_ORG: edmodel
Copy link
Contributor

Choose a reason for hiding this comment

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

Nice catch, though we should probably acknowledge that this code is based on PEcAn somewhere.

@@ -53,3 +54,23 @@ If you plan to develop the code, please refer to the Wiki entries on <a href="ht

We strongly encourage that code developments are properly documented. Please refer to the <a href="https://github.com/EDmodel/ED2/wiki/ED2-Documentation-with-Doxygen">Doxygen</a> instructions, and especially the <a href="https://github.com/EDmodel/ED2/wiki/ED2-Documentation-with-Doxygen#doxygit"> Doxygen and Git commits</a> section, so additional documentation can be automatically generated from the source code comments.

## <a name="docker"> Using Docker</a>
Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for adding this! By the way, we can also include additional documentation (if needed) in the Wiki.

@robkooper robkooper marked this pull request as ready for review August 18, 2024 16:54
@robkooper robkooper merged commit 7f9cb28 into master Aug 22, 2024
6 checks passed
@robkooper robkooper deleted the fix-docker branch August 22, 2024 11:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Docker image not being updated by GH actions
3 participants