Sync develop to master #270
Conversation
* Update Version to 4.5.0 * Use dockerhub stol action
paulbourelly999
requested review from
MishkaMN,
JonSmet,
adev4a and
SaikrishnaBairamoni
|
Tried investigating the autoware failure again a bit more without success. Documented my progress here: |
|
|
||
| FROM base_image AS build | ||
|
|
||
| ARG GIT_BRANCH=develop |
There was a problem hiding this comment.
Since users will typically use the build-image.sh script directly, which calls this Dockerfile, do we want to update build-image.sh to take a git branch as an argument, and then pass it as a GIT_BRANCH arg into Dockerfile?
I suppose the same question can be asked for DOCKER_ORG and DOCKER_TAG as well.
There was a problem hiding this comment.
Or if this PR is only addressing the fix from an automated CI standpoint, we can create a separate story (or multiple) to fix it from a user standpoint.
There was a problem hiding this comment.
I think they new arguments in the docker file will largely replace build-image.sh functionality that is responsible for setting org/tag for images.
There was a problem hiding this comment.
I am okay with merging this since that build-images.sh script needed manual edits to work correctly anyways (such as checkout scripts or Dockerfile edits).
I do agree we can create new story to modify pass in these arguments based on what build-script.sh sets the metada.
|
Fixed the failing docker build. Related to docker build context being default git context. Read https://docs.docker.com/reference/cli/docker/image/build/#git-repositories and https://github.com/docker/build-push-action?tab=readme-ov-file |
|
|
||
| FROM base_image AS build | ||
|
|
||
| ARG GIT_BRANCH=develop |
There was a problem hiding this comment.
I am okay with merging this since that build-images.sh script needed manual edits to work correctly anyways (such as checkout scripts or Dockerfile edits).
I do agree we can create new story to modify pass in these arguments based on what build-script.sh sets the metada.
PR Details
Description
This is an intermediate branch cut from master which includes fixes to the branch coupling of build and checkout scripts. This coupling can not yet be removed from CI processes because this repository still uses CircleCI. The functionality to decouple CI from branches is currently only available through our GitHub actions
Related GitHub Issue
Related Jira Key
Motivation and Context
Decouple build/checkout from branch to make release process simpler
How Has This Been Tested?
CI
Types of changes
Checklist: