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(ci): docker image push fixes #395

Merged
merged 1 commit into from
Apr 3, 2024
Merged

Conversation

d33bs
Copy link
Member

@d33bs d33bs commented Apr 2, 2024

Description

This PR fixes a Docker image push trigger which didn't occur after merging in #377 . I believe this GH Actions run should have seen a push to Docker hub, but the if-conditions failed to trigger.

It also fixes incorrect Dockerfile path and tag naming witnessed after a scheduled job failure.

Thanks for any feedback you may have!

References #214

What is the nature of your change?

  • Bug fix (fixes an issue).
  • Enhancement (adds functionality).
  • Breaking change (fix or feature that would cause existing functionality to not work as expected).
  • This change requires a documentation update.

Checklist

Please ensure that all boxes are checked before indicating that a pull request is ready for review.

  • I have read the CONTRIBUTING.md guidelines.
  • My code follows the style guidelines of this project.
  • I have performed a self-review of my own code.
  • I have commented my code, particularly in hard-to-understand areas.
  • I have made corresponding changes to the documentation.
  • My changes generate no new warnings.
  • New and existing unit tests pass locally with my changes.
  • I have added tests that prove my fix is effective or that my feature works.
  • I have deleted all non-relevant text in this pull request template.

@d33bs d33bs requested a review from kenibrewer April 2, 2024 22:07
kenibrewer
kenibrewer previously approved these changes Apr 2, 2024
Copy link
Member

@kenibrewer kenibrewer left a comment

Choose a reason for hiding this comment

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

Sorry for jinxing this. 😅

@d33bs d33bs force-pushed the fix-docker-push branch from cdb6fae to 06d3ee6 Compare April 3, 2024 11:47
@d33bs d33bs changed the title fix(ci): docker img push trigger if-conds for push fix(ci): docker image push fixes Apr 3, 2024
@d33bs d33bs requested a review from kenibrewer April 3, 2024 11:50
@d33bs d33bs force-pushed the fix-docker-push branch from 06d3ee6 to 22a8a09 Compare April 3, 2024 12:01
@d33bs
Copy link
Member Author

d33bs commented Apr 3, 2024

Absolutely no worries @kenibrewer ! Thanks for the earlier review. After seeing the scheduled job failure I decided to apply further fixes for the image tags, Dockerfile location, and removing tests from the build source (I believe the earlier copy for testing would persist into the production builds). I've re-requested a review as the changes are more broad than they initially were.

@kenibrewer kenibrewer dismissed their stale review April 3, 2024 12:10

additional changes

Copy link
Member

@kenibrewer kenibrewer 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 re-requesting review here. There's one change we should make to the Dockerfile if we want a slimmed down production build.

.github/workflows/integration-test.yml Outdated Show resolved Hide resolved
@kenibrewer
Copy link
Member

Here's another possible change at your discretion. This would make it a bit easier with the context management.

  1. Move ./build/docker/Dockerfile to ./Dockerfile
  2. Add the tests directory as an include for the sdist build artifact but not wheel (instructions)

I think the end result would be that the commands docker build . --target testing would work both in a cloned repo root or in an extracted sdist.

@d33bs d33bs force-pushed the fix-docker-push branch from 22a8a09 to b4c7fc1 Compare April 3, 2024 15:01
Co-Authored-By: Ken Brewer <kenibrewer@users.noreply.github.com>
@d33bs d33bs force-pushed the fix-docker-push branch from b4c7fc1 to 0c56eb6 Compare April 3, 2024 15:51
@d33bs
Copy link
Member Author

d33bs commented Apr 3, 2024

Thanks @kenibrewer ! I applied the changes you mentioned but held off for now on the Dockerfile / pyproject.toml changes as I wasn't as certain about impacts or implementation here. I'll create a new issue as these feel like great future additions.

Copy link
Member

@kenibrewer kenibrewer left a comment

Choose a reason for hiding this comment

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

Looks good! Thanks for capturing the new issue

@d33bs
Copy link
Member Author

d33bs commented Apr 3, 2024

Thanks @kenibrewer ! Merging this in.

@d33bs d33bs merged commit 43e2285 into cytomining:main Apr 3, 2024
11 checks passed
@d33bs d33bs deleted the fix-docker-push branch April 3, 2024 19:58
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.

2 participants