Skip to content

Commit

Permalink
Added upstream changes and fixes to docker install
Browse files Browse the repository at this point in the history
  • Loading branch information
evan-palmer committed Jun 24, 2024
1 parent 86529c3 commit 54e0efb
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 7 deletions.
6 changes: 6 additions & 0 deletions .docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ RUN sudo apt-get -q update \
gstreamer1.0-plugins-ugly \
gstreamer1.0-plugins-bad \
gstreamer1.0-libav \
libgstreamer1.0-dev \
gstreamer1.0-gl \
libgstreamer-plugins-base1.0-dev \
&& sudo apt-get autoremove -y \
&& sudo apt-get clean -y \
&& sudo rm -rf /var/lib/apt/lists/*
Expand Down Expand Up @@ -118,6 +121,9 @@ RUN sudo apt-get -q update \
python3-wxgtk4.0 \
rapidjson-dev \
xterm \
libgz-sim7-dev \
rapidjson-dev \
libopencv-dev \
&& sudo apt-get autoremove -y \
&& sudo apt-get clean -y \
&& sudo rm -rf /var/lib/apt/lists/*
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
type=raw,value=${{ matrix.ROS_DISTRO }}-${{ github.job }}
- name: Build and push Docker image
uses: docker/build-push-action@v6.0.0
uses: docker/build-push-action@v6.1.0
with:
context: .
file: .docker/Dockerfile
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
type=raw,value=${{ matrix.ROS_DISTRO }}-${{ github.job }}
- name: Build and push Docker image
uses: docker/build-push-action@v6.0.0
uses: docker/build-push-action@v6.1.0
with:
context: .
file: .docker/Dockerfile
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
type=raw,value=${{ matrix.ROS_DISTRO }}-${{ github.job }}
- name: Build and push Docker image
uses: docker/build-push-action@v6.0.0
uses: docker/build-push-action@v6.1.0
with:
context: .
file: .docker/Dockerfile
Expand Down Expand Up @@ -179,7 +179,7 @@ jobs:
type=raw,value=${{ matrix.ROS_DISTRO }}-${{ github.job }}
- name: Build and push Docker image
uses: docker/build-push-action@v6.0.0
uses: docker/build-push-action@v6.1.0
with:
context: .
file: .docker/Dockerfile
Expand Down
10 changes: 9 additions & 1 deletion docs/docs/overview.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,15 @@ following features:
writing your robotics algorithms 😀
4. **Custom control and localization algorithms**: Blue supports custom
controllers implemented using [auv_controllers](https://github.com/Robotic-Decision-Making-Lab/auv_controllers)
and localization algorithms implemented using [marine_localization](https://github.com/Robotic-Decision-Making-Lab/marine_localization).
and localization algorithms implemented using [blue_localization](https://github.com/Robotic-Decision-Making-Lab/blue/tree/main/blue_localization).

:::info

The features implemented in `blue_localization` are currently being ported to
[marine_localization](https://github.com/Robotic-Decision-Making-Lab/marine_localization).
Keep an eye on that repository for the latest changes and updates.

:::

## Recommended workflow

Expand Down
4 changes: 2 additions & 2 deletions docs/docs/welcome.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import CodeBlock from '@theme/CodeBlock';
regarding usage of Blue, please ask a question on our [Discussions](https://github.com/Robotic-Decision-Making-Lab/blue/discussions)
board! If you would like to contribute to Blue, please see our [contribution guidelines](/contributing).

If you find Blue to be helpful in your work, please consider citing our
paper:
If you find Blue to be helpful in your work, please consider citing
[our paper](https://research.engr.oregonstate.edu/rdml/sites/research.engr.oregonstate.edu.rdml/files/icra24_3342_fi.pdf):
</p>
<div className="front-matter-code">
<CodeBlock>
Expand Down

0 comments on commit 54e0efb

Please sign in to comment.