Skip to content

make the agent image 4x smaller thanks to multi stage build (backport #90)#93

Merged
pablogs9 merged 2 commits intomainfrom
mergify/bp/main/pr-90
Nov 24, 2022
Merged

make the agent image 4x smaller thanks to multi stage build (backport #90)#93
pablogs9 merged 2 commits intomainfrom
mergify/bp/main/pr-90

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Nov 24, 2022

This is an automatic backport of pull request #90 done by Mergify.
Cherry-pick of 4d0209d has failed:

On branch mergify/bp/main/pr-90
Your branch is up to date with 'origin/main'.

You are currently cherry-picking commit 4d0209d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   micro-ROS-Agent/micro-ros_entrypoint.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   base/Dockerfile
	both modified:   micro-ROS-Agent/Dockerfile

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit 4d0209d)

# Conflicts:
#	base/Dockerfile
#	micro-ROS-Agent/Dockerfile
Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
@pablogs9 pablogs9 merged commit 9d62cf8 into main Nov 24, 2022
@pablogs9 pablogs9 deleted the mergify/bp/main/pr-90 branch November 24, 2022 15:27
pablogs9 added a commit that referenced this pull request Dec 12, 2022
…90) (#93)

* make the agent image 4x smaller thanks to multi stage build (#90)

(cherry picked from commit 4d0209d)

# Conflicts:
#	base/Dockerfile
#	micro-ROS-Agent/Dockerfile

* Fix

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
Co-authored-by: Dominik Nowak <dominik.nwk@gmail.com>
Co-authored-by: Pablo Garrido <pablogs9@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants