Skip to content

Conversation

@oleschwen
Copy link
Collaborator

@oleschwen oleschwen commented Mar 6, 2025

Summary of changes

  • history contains intermediate variants replaced later (no longer visible in the diff)
  • use single Docker image for client, server, dashboard, tests
  • use version number automatically from single location when building Docker image or startup kits via script
  • updated documentation accordingly
  • server startup docker script can report packages and their licenses

@oleschwen oleschwen linked an issue Mar 11, 2025 that may be closed by this pull request
2 tasks
@oleschwen oleschwen marked this pull request as ready for review March 13, 2025 15:10
@oleschwen oleschwen changed the title WIP Dev 26 versioning docker images Dev 26 versioning docker images Mar 17, 2025

0. **Clone the repository:**
# Usage for Developers

Copy link
Contributor

Choose a reason for hiding this comment

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

Can we put the guide for swarm participants above the developers? Many of the collaborators directly went into executing the commands through the readme

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, and check references to "above"

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Done.

@@ -0,0 +1,2 @@
# version of the ODELIA Docker image, read by different scripts
0.9 No newline at end of file
Copy link
Contributor

Choose a reason for hiding this comment

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

I am wondering if we can relate the version number to something live PR? I forgot what does 0.9 mean here.

Can I propose 0.26.0-dev.33 here?
0.26.0: Indicates the 26th development iteration (assuming semantic versioning).
-dev.33: Marks it as a development build tied to PR #33.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Discussed in call:
.-dev..<git rev-parse --short HEAD>
currently: 0.9-dev.20250317.c630010 (also for versions used in the swarm)
releases: omit -dev. part
script to generate startup scripts already includes this in the docker.sh scripts where it is also displayed during normal usage; should generate .zip files per startup kits containing the version number in the filename

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

done

See [application/jobs/minimal_training_pytorch_cnn/README.md](application/jobs/minimal_training_pytorch_cnn/README.md)
3. **3D CNN for classifying breast tumors:**
See [3dcnn_ptl/README.md](application/jobs/3dcnn_ptl/README.md)
## Build the Docker Image
Copy link
Contributor

Choose a reason for hiding this comment

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

we should do git submodule update docker_config/NVFlare/ before this right?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, add this after the "clone"

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Done.

@Ultimate-Storm Ultimate-Storm merged commit 8fdbbfc into main Mar 18, 2025
3 checks passed
@Ultimate-Storm Ultimate-Storm deleted the dev-26-versioning-docker-images branch March 18, 2025 09:47
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.

Versioning of Docker images

3 participants