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

feat(docker): Rename images to new defaults #7801

Merged
merged 5 commits into from
Nov 9, 2023
Merged

Conversation

heliocastro
Copy link
Contributor

@heliocastro heliocastro commented Nov 2, 2023

Rename Docker image 'ort' to 'ort-minimal' and 'ort-extended' to 'ort' as agreed in community vote
to make it easier for new users to understand difference between ORT Docker images.
Additionally the language component images now have named version with a hash to enable checking if contents
of an image has changed without changing core language.

Closes: #7798

@heliocastro heliocastro self-assigned this Nov 2, 2023
@heliocastro heliocastro force-pushed the heliocastro/docker_fix branch 3 times, most recently from 10702f7 to 2d1e251 Compare November 2, 2023 13:09
Copy link

codecov bot commented Nov 2, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (1534d39) 67.24% compared to head (818840b) 67.24%.
Report is 1 commits behind head on main.

❗ Current head 818840b differs from pull request most recent head 54fe55f. Consider uploading reports for the commit 54fe55f to get more accurate results

Additional details and impacted files
@@            Coverage Diff            @@
##               main    #7801   +/-   ##
=========================================
  Coverage     67.24%   67.24%           
  Complexity     2044     2044           
=========================================
  Files           356      356           
  Lines         17057    17057           
  Branches       2440     2440           
=========================================
  Hits          11470    11470           
  Misses         4568     4568           
  Partials       1019     1019           
Flag Coverage Δ
funTest-non-docker 37.35% <ø> (ø)
test 34.97% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@heliocastro heliocastro force-pushed the heliocastro/docker_fix branch 5 times, most recently from 35b1114 to 6f50f00 Compare November 2, 2023 15:34
@heliocastro heliocastro marked this pull request as ready for review November 2, 2023 15:34
@heliocastro heliocastro requested a review from a team as a code owner November 2, 2023 15:34
.github/actions/ortdocker/action.yml Outdated Show resolved Hide resolved
@heliocastro heliocastro force-pushed the heliocastro/docker_fix branch 3 times, most recently from 0a33817 to 8722b15 Compare November 2, 2023 16:24
Copy link
Member

@sschuberth sschuberth left a comment

Choose a reason for hiding this comment

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

Additionally the language component images now have named version with a hash to enable checking if contents of an image has changed without changing core language.

I propose to do this change in a preceding commit as it's not really on the topic of just renaming the Docker images.

.github/actions/ortdocker/action.yml Outdated Show resolved Hide resolved
.github/actions/ortdocker/check_image.py Show resolved Hide resolved
@heliocastro heliocastro force-pushed the heliocastro/docker_fix branch 3 times, most recently from 2361b02 to 85002d7 Compare November 3, 2023 07:47
@heliocastro heliocastro force-pushed the heliocastro/docker_fix branch 3 times, most recently from 2bbb467 to 5a2fd32 Compare November 6, 2023 09:37
@heliocastro
Copy link
Contributor Author

Additionally the language component images now have named version with a hash to enable checking if contents of an image has changed without changing core language.

I propose to do this change in a preceding commit as it's not really on the topic of just renaming the Docker images.

Is mention before, the change and fix are coupled, no reason to do two separate entries.
Can we move forward now ?

@tsteenbe tsteenbe added docker About Docker topics breaking change labels Nov 7, 2023
tsteenbe
tsteenbe previously approved these changes Nov 7, 2023
tsteenbe
tsteenbe previously approved these changes Nov 8, 2023
@heliocastro heliocastro dismissed sschuberth’s stale review November 8, 2023 18:51

This was answered and fixed on latest push

@heliocastro heliocastro force-pushed the heliocastro/docker_fix branch 3 times, most recently from 32cb536 to 20d65fd Compare November 9, 2023 10:03
@heliocastro heliocastro requested a review from tsteenbe November 9, 2023 10:33
@heliocastro heliocastro enabled auto-merge (rebase) November 9, 2023 10:34
.github/actions/ortdocker/action.yml Show resolved Hide resolved
Dockerfile Show resolved Hide resolved
scripts/custom_docker.sh Show resolved Hide resolved
scripts/custom_docker.sh Show resolved Hide resolved
scripts/docker_build.sh Show resolved Hide resolved
.github/workflows/docker-ort.yml Show resolved Hide resolved
@heliocastro heliocastro force-pushed the heliocastro/docker_fix branch 2 times, most recently from afaec77 to b01e2de Compare November 9, 2023 16:03
@heliocastro heliocastro requested a review from fviernau November 9, 2023 16:08
@heliocastro heliocastro dismissed fviernau’s stale review November 9, 2023 16:42

We should keep it splitted

@heliocastro heliocastro force-pushed the heliocastro/docker_fix branch from b01e2de to 818840b Compare November 9, 2023 16:52
In order to assemble the ORT docker image(s), the GitHub action first
builds the component images and then the main images using the
previously built component images.
Each component image build is skipped (for efficiency) if the image
with the needed tag already exists.

As tag, the version of the tooling of the particular ecosystem is used,
e.g. ghcr.io/oss-review-toolkit/python:3.11.5.

Using only the main tooling version as cache key is problematic, because
it leads to accidentally skipping of component image builds.
This may happen when any of the BUILD ARGS has changed.

Fix this by including a hash of the build args into the image tags.

Signed-off-by: Helio Chissini de Castro <[email protected]>
The name changing allows to move the extended separated bits on previous
adoption to a unified file.
Now the new run target is based on previous extended image, and the
original run target is now called minimal.

Signed-off-by: Helio Chissini de Castro <[email protected]>
Change the build scripts to new minimal / ort images.
Naming had a slightly change from components as add to a subdomain
(ort/component) to a direct component naming, making equal to upstream
naming.

The explicit call to Dockerfile file name is not needed anymore, as
only a single Dockerfile exists after name changing.

Signed-off-by: Helio Chissini de Castro <[email protected]>
Custom image now is named with dash to match Dockerfile-legacy
naming.

Signed-off-by: Helio Chissini de Castro <[email protected]>
Rename Docker image 'ort' to 'ort-minimal' and  'ort-extended' to 'ort'
as agreed in community vote to make it easier for new users to understand
difference between ORT Docker images.

Signed-off-by: Helio Chissini de Castro <[email protected]>
@tsteenbe tsteenbe force-pushed the heliocastro/docker_fix branch from 818840b to 54fe55f Compare November 9, 2023 17:39
@heliocastro heliocastro merged commit 8d7b82d into main Nov 9, 2023
34 checks passed
@heliocastro heliocastro deleted the heliocastro/docker_fix branch November 9, 2023 18:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docker About Docker topics
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Docker: Update of python-inspector version not reflected in 'ort-extended' image 6.0.0
4 participants