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

Style: Upcase "as" in Dockerfile (backport #214) #217

Merged
merged 4 commits into from
Jul 26, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 26, 2024

Changes Made

docker buildx contains some internal style checking. One of the rules is FromAsCasing which is issued as warning.

This PR upcases "as" in the Dockerfile to remove this warning.

Associated Issues

None

Testing

Test via CI.


This is an automatic backport of pull request #214 done by Mergify.

Co-authored-by: Aaron Marburg <amarburg@uw.edu>
(cherry picked from commit 8bbb19e)

# Conflicts:
#	.docker/Dockerfile
@mergify mergify bot added the conflicts label Jul 26, 2024
Copy link
Author

mergify bot commented Jul 26, 2024

Cherry-pick of 8bbb19e has failed:

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

You are currently cherry-picking commit 8bbb19e.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .docker/Dockerfile

no changes added to commit (use "git add" and/or "git commit -a")

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

@evan-palmer evan-palmer merged commit 3e5c964 into iron Jul 26, 2024
7 checks passed
@evan-palmer evan-palmer deleted the mergify/bp/iron/pr-214 branch July 26, 2024 23:18
evan-palmer added a commit that referenced this pull request Aug 9, 2024
* Updated controller manager launch in demo

* Resolved bug in BlueROV2 Heavy and Heavy Reach launch configurations (#193) (#194)

* Fixed ardusub_gazebo install and mavros configurations

* Remapped controller manager topic to robot state publisher topic

* Added missing gstreamer dependency

(cherry picked from commit 9ddb154)

Co-authored-by: Evan Palmer <evanp922@gmail.com>

* Added additional resources for USB/IP tutorial (#196) (#198)

(cherry picked from commit 531ed83)

Co-authored-by: Evan Palmer <evanp922@gmail.com>

* Bump docker/build-push-action from 6.1.0 to 6.2.0 (#200) (#202)

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](docker/build-push-action@v6.1.0...v6.2.0)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 8639c41)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Add xacro as an exec_depend for blue_description (#215) (#219)

Co-authored-by: Aaron Marburg <amarburg@uw.edu>
(cherry picked from commit 506be06)

Co-authored-by: Aaron Marburg <amarburg@apl.washington.edu>

* Style: Upcase  "as" in Dockerfile (backport #214) (#217)

* Fix case on "as" in Dockerfile (#214)

Co-authored-by: Aaron Marburg <amarburg@uw.edu>
(cherry picked from commit 8bbb19e)

# Conflicts:
#	.docker/Dockerfile

* Resolved merge conflicts

* Bump build versions

---------

Co-authored-by: Aaron Marburg <amarburg@apl.washington.edu>
Co-authored-by: Evan Palmer <evanp922@gmail.com>

* Add "robot" container (backport #221) (#225)

* Add "robot" container (#221)

* Initial commit of _robot container and devcontainer

* Add xacro as an exec_depend for blue_description

* Update comments

* Remove unused Docker stage "blue_src_and_deps"

Renamed *.repos --> blue.repos and sim.repos

---------

Co-authored-by: Aaron Marburg <amarburg@uw.edu>
(cherry picked from commit ba77c25)

# Conflicts:
#	blue.repos

* Fixed merge conflict from mergify

* Use "iron" branch of ros_gz

---------

Co-authored-by: Aaron Marburg <amarburg@apl.washington.edu>
Co-authored-by: Evan Palmer <evanp922@gmail.com>
Co-authored-by: Aaron Marburg <amarburg@uw.edu>

* Use Gazebo Harmonic (#223) (#231)

* Update to use Harmonic

* Add "third-party" rosdep from OSRF for gazebo deps.

* Added comment on "user ROOT" rather than sudo, joined two adjacent apt-get install steps.

* Correct error in comment

---------

Co-authored-by: Aaron Marburg <amarburg@uw.edu>
(cherry picked from commit 8a4e05a)

Co-authored-by: Aaron Marburg <amarburg@apl.washington.edu>

* Install ros_gz from binary package (iron, humble) (#228)

* Install ros_gz from package, not from source, remove sim.repos

* Removed additional apt-get lines from cherry-pick

---------

Co-authored-by: Aaron Marburg <amarburg@uw.edu>

* Install ros_gz from binary package (iron, humble) (#228)

* Install ros_gz from package, not from source, remove sim.repos

* Removed additional apt-get lines from cherry-pick

---------

Co-authored-by: Aaron Marburg <amarburg@uw.edu>
(cherry picked from commit 0e297bc)

# Conflicts:
#	sim.repos

---------

Co-authored-by: Evan Palmer <evanp922@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Aaron Marburg <amarburg@apl.washington.edu>
Co-authored-by: Aaron Marburg <amarburg@uw.edu>
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