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

Use git version inside app container build #930

Merged
merged 2 commits into from
Oct 15, 2024
Merged

Conversation

ml-evs
Copy link
Member

@ml-evs ml-evs commented Oct 15, 2024

This PR follows up #906 by using the version in the docker build, where available. It also provides the ability to manually set the tag version (useful in cases where the docker build is running inside git worktrees, or submodules).

@ml-evs ml-evs added the build For issues/PRs pertaining to the build or deployment of the package label Oct 15, 2024
Copy link

codecov bot commented Oct 15, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.34%. Comparing base (05709fb) to head (beff6f4).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #930   +/-   ##
=======================================
  Coverage   68.34%   68.34%           
=======================================
  Files          62       62           
  Lines        3924     3924           
=======================================
  Hits         2682     2682           
  Misses       1242     1242           

Copy link

cypress bot commented Oct 15, 2024

datalab    Run #2559

Run Properties:  status check passed Passed #2559  •  git commit cd58e6d80e ℹ️: Merge beff6f4d0bff3214092147ee101c5b37c6def8d1 into 05709fb04476ec46888ca93a86f0...
Project datalab
Run status status check passed Passed #2559
Run duration 06m 41s
Commit git commit cd58e6d80e ℹ️: Merge beff6f4d0bff3214092147ee101c5b37c6def8d1 into 05709fb04476ec46888ca93a86f0...
Committer Matthew Evans
View all properties for this run ↗︎

Test results
Tests that failed  Failures 0
Tests that were flaky  Flaky 0
Tests that did not run due to a developer annotating a test with .skip  Pending 0
Tests that did not run due to a failure in a mocha hook  Skipped 0
Tests that passed  Passing 396

.docker/app_dockerfile Outdated Show resolved Hide resolved
.docker/server_dockerfile Outdated Show resolved Hide resolved
.docker/app_dockerfile Outdated Show resolved Hide resolved
Copy link
Contributor

@BenjaminCharmes BenjaminCharmes left a comment

Choose a reason for hiding this comment

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

LGTM 👍 🚀

@ml-evs ml-evs merged commit cf18968 into main Oct 15, 2024
17 checks passed
@ml-evs ml-evs deleted the ml-evs/docker-versions branch October 15, 2024 15:31
BenjaminCharmes pushed a commit that referenced this pull request Oct 15, 2024
* Pass git version into app container and allow it to be overwritten by .env

* Tidying
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build For issues/PRs pertaining to the build or deployment of the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants