Skip to content

Commit

Permalink
add dockerfile lint
Browse files Browse the repository at this point in the history
  • Loading branch information
woensug-choi committed May 31, 2024
1 parent ab20b92 commit 034568c
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ You can pull a prebuilt image with this docker tag: `ghcr.io/ros-controls/dave_s

To build and run the container, execute the following code in a terminal:
```
docker build --tag dave:source --file .docker/Dockerfile .
docker build --tag dave:source --file .docker/jazzy.dockerfile .
docker run -it dave:source
```

Expand Down
11 changes: 5 additions & 6 deletions .docker/Dockerfile → .docker/jazzy.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,17 @@ ENV ROS_UNDERLAY /root/ws_dave/install
WORKDIR $ROS_UNDERLAY/../src

ADD https://raw.githubusercontent.com/IOES-Lab/dave/$BRANCH/\
extras/repos/dave.$ROS_DISTRO.repos dave.repos
extras/repos/dave.$ROS_DISTRO.repos dave.repos
RUN vcs import < dave.repos

RUN apt-get update && rosdep update && \
rosdep install -iy --from-paths . && \
rm -rf /var/lib/apt/lists/

RUN cd $ROS_UNDERLAY/.. && \
. /opt/ros/${ROS_DISTRO}/setup.sh && \
colcon build
WORKDIR $ROS_UNDERLAY/..
RUN . "/opt/ros/${ROS_DISTRO}/setup.sh" && \
colcon build

# source entrypoint setup
RUN sed --in-place --expression \
'$isource "$ROS_UNDERLAY/setup.bash"' \
/ros_entrypoint.sh
'$i source "$ROS_UNDERLAY/setup.bash"' /ros_entrypoint.sh
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
file: .docker/Dockerfile
file: .docker/jazzy.dockerfile
build-args: |
ROS_DISTRO=${{ env.ROS_DISTRO }}
BRANCH=${{ env.BRANCH }}
Expand Down
1 change: 1 addition & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -158,4 +158,5 @@ repos:
rev: v3.5.0 # You may version pin this if desired
hooks:
- id: docker-lint

Check failure on line 160 in .pre-commit-config.yaml

View workflow job for this annotation

GitHub Actions / Run Linters for Code Format Check

160:5 [indentation] wrong indentation: expected 6 but found 4
files: \.dockerfile
- id: docker-compose-lint
14 changes: 7 additions & 7 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,14 @@ This changelog covers the entire dave project which includes a few repositories,
### Update
- Official Ubuntu Focal (20.04) - Noetic - Gazebo 11 Support
- VCS support : [dave PR #137](https://github.com/Field-Robotics-Lab/dave/pull/137)
- Compatability to Noetic and Melodic
- Remove legcy Image sonar and GPS inhereted from UUV Simulator : [dave PR #94](https://github.com/Field-Robotics-Lab/dave/pull/94)
- Compatibility to Noetic and Melodic
- Remove legcy Image sonar and GPS inherited from UUV Simulator : [dave PR #94](https://github.com/Field-Robotics-Lab/dave/pull/94)
- Ocean current plugin
- Relative path for stratified/transient ocean current databasefile path : [dave PR #95](https://github.com/Field-Robotics-Lab/dave/pull/95)
- ROS topic format updated to Vector3 and reorganized cross-dependency between model/world plugin source codes : [dave PR #86](https://github.com/Field-Robotics-Lab/dave/issues/86) and [dave PR #100](https://github.com/Field-Robotics-Lab/dave/pull/100)
- Multiple vehicle support : [dave PR #101](https://github.com/Field-Robotics-Lab/dave/pull/101)
- Tidal Oscillation support : [dave PR #102](https://github.com/Field-Robotics-Lab/dave/pull/102)
- Fix sudden jump at databse interpolation : [dave PR #106](https://github.com/Field-Robotics-Lab/dave/pull/106)
- Fix sudden jump at database interpolation : [dave PR #106](https://github.com/Field-Robotics-Lab/dave/pull/106)
- Predator arm
- texture fix : [dave PR #99](https://github.com/Field-Robotics-Lab/dave/pull/99)
- Change joint name : [dave PR #112](https://github.com/Field-Robotics-Lab/dave/pull/112)
Expand Down Expand Up @@ -134,13 +134,13 @@ This changelog covers the entire dave project which includes a few repositories,
- Multibeam Sonar URDF for standalone and robot description [Multibeam Sonar PR #38](https://github.com/Field-Robotics-Lab/nps_uw_multibeam_sonar/pull/38)
- Documentation and tutorial for the local search scenario demonstration with GPURay-based multibeam sonar [wiki](https://github.com/Field-Robotics-Lab/dave/wiki/Multibeam-Forward-Looking-Sonar#degradaded-object-detection-scenarios)
- Documentation and tutorial for the degraded object detection scenarios with distorted mesh models [wiki](https://github.com/Field-Robotics-Lab/dave/wiki/Multibeam-Forward-Looking-Sonar#degradaded-object-detection-scenarios) and [Multibeam Sonar PR #33](https://github.com/Field-Robotics-Lab/nps_uw_multibeam_sonar/pull/33)

- Bathymetry Converter
- Docker image distribution including neccesary libraries and excutables [Docker Hub image](https://hub.docker.com/r/woensugchoi/bathymetry_converter)
- Docker image distribution including necessary libraries and executables [Docker Hub image](https://hub.docker.com/r/woensugchoi/bathymetry_converter)
- Redesign of the automatic tile generator with python language [mkbathy.py](https://github.com/Field-Robotics-Lab/Bathymetry_Converter/blob/a6fa5ba1549e15a17eb7869f6103e907b9f4394a/mkbathy.py)
- Automatic color texture generation with bathymetry depth

- Demonstration of Importing Bathymetric Maps
- Demonstration of Importing Bathymetric Maps
- [Bathymetry Models Wiki](https://github.com/Field-Robotics-Lab/dave/wiki/Bathymetry-Models)

- Mud Plugin
Expand All @@ -151,7 +151,7 @@ This changelog covers the entire dave project which includes a few repositories,
- Creation of MoveIt-based infrastructure for motion planning with single and multi-arm systems. [uuv_manipulators PR #8](https://github.com/Field-Robotics-Lab/uuv_manipulators/pull/8)
- Addition and configuration of multiple arms onboard arbitrary robot. [dave PR #206](https://github.com/Field-Robotics-Lab/dave/pull/206)
- Demonstration of bimanual manipulation scenarios using joy teleop, RViz interaction, and MoveIt ROS nodes. [dave PR #228](https://github.com/Field-Robotics-Lab/dave/pull/228)
- Documentation and tutorial [wiki](https://github.com/Field-Robotics-Lab/dave/wiki/Bimanual-Manipulation-Setup-and-Examples)
- Documentation and tutorial [wiki](https://github.com/Field-Robotics-Lab/dave/wiki/Bimanual-Manipulation-Setup-and-Examples)

- Mating Plugin
- Expose mating forces for mating plugin as ROS publication [dave PR #189](https://github.com/Field-Robotics-Lab/dave/pull/189)
Expand Down

0 comments on commit 034568c

Please sign in to comment.