Skip to content

Commit 034568c

Browse files
committed
add dockerfile lint
1 parent ab20b92 commit 034568c

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

.docker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ You can pull a prebuilt image with this docker tag: `ghcr.io/ros-controls/dave_s
99

1010
To build and run the container, execute the following code in a terminal:
1111
```
12-
docker build --tag dave:source --file .docker/Dockerfile .
12+
docker build --tag dave:source --file .docker/jazzy.dockerfile .
1313
docker run -it dave:source
1414
```
1515

.docker/Dockerfile renamed to .docker/jazzy.dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,17 @@ ENV ROS_UNDERLAY /root/ws_dave/install
66
WORKDIR $ROS_UNDERLAY/../src
77

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

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

16-
RUN cd $ROS_UNDERLAY/.. && \
17-
. /opt/ros/${ROS_DISTRO}/setup.sh && \
18-
colcon build
16+
WORKDIR $ROS_UNDERLAY/..
17+
RUN . "/opt/ros/${ROS_DISTRO}/setup.sh" && \
18+
colcon build
1919

2020
# source entrypoint setup
2121
RUN sed --in-place --expression \
22-
'$isource "$ROS_UNDERLAY/setup.bash"' \
23-
/ros_entrypoint.sh
22+
'$i source "$ROS_UNDERLAY/setup.bash"' /ros_entrypoint.sh

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
push: true
5151
tags: ${{ steps.meta.outputs.tags }}
5252
labels: ${{ steps.meta.outputs.labels }}
53-
file: .docker/Dockerfile
53+
file: .docker/jazzy.dockerfile
5454
build-args: |
5555
ROS_DISTRO=${{ env.ROS_DISTRO }}
5656
BRANCH=${{ env.BRANCH }}

.pre-commit-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,4 +158,5 @@ repos:
158158
rev: v3.5.0 # You may version pin this if desired
159159
hooks:
160160
- id: docker-lint
161+
files: \.dockerfile
161162
- id: docker-compose-lint

Changelog.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,14 @@ This changelog covers the entire dave project which includes a few repositories,
7575
### Update
7676
- Official Ubuntu Focal (20.04) - Noetic - Gazebo 11 Support
7777
- VCS support : [dave PR #137](https://github.com/Field-Robotics-Lab/dave/pull/137)
78-
- Compatability to Noetic and Melodic
79-
- Remove legcy Image sonar and GPS inhereted from UUV Simulator : [dave PR #94](https://github.com/Field-Robotics-Lab/dave/pull/94)
78+
- Compatibility to Noetic and Melodic
79+
- Remove legcy Image sonar and GPS inherited from UUV Simulator : [dave PR #94](https://github.com/Field-Robotics-Lab/dave/pull/94)
8080
- Ocean current plugin
8181
- Relative path for stratified/transient ocean current databasefile path : [dave PR #95](https://github.com/Field-Robotics-Lab/dave/pull/95)
8282
- 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)
8383
- Multiple vehicle support : [dave PR #101](https://github.com/Field-Robotics-Lab/dave/pull/101)
8484
- Tidal Oscillation support : [dave PR #102](https://github.com/Field-Robotics-Lab/dave/pull/102)
85-
- Fix sudden jump at databse interpolation : [dave PR #106](https://github.com/Field-Robotics-Lab/dave/pull/106)
85+
- Fix sudden jump at database interpolation : [dave PR #106](https://github.com/Field-Robotics-Lab/dave/pull/106)
8686
- Predator arm
8787
- texture fix : [dave PR #99](https://github.com/Field-Robotics-Lab/dave/pull/99)
8888
- Change joint name : [dave PR #112](https://github.com/Field-Robotics-Lab/dave/pull/112)
@@ -134,13 +134,13 @@ This changelog covers the entire dave project which includes a few repositories,
134134
- Multibeam Sonar URDF for standalone and robot description [Multibeam Sonar PR #38](https://github.com/Field-Robotics-Lab/nps_uw_multibeam_sonar/pull/38)
135135
- 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)
136136
- 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)
137-
137+
138138
- Bathymetry Converter
139-
- Docker image distribution including neccesary libraries and excutables [Docker Hub image](https://hub.docker.com/r/woensugchoi/bathymetry_converter)
139+
- Docker image distribution including necessary libraries and executables [Docker Hub image](https://hub.docker.com/r/woensugchoi/bathymetry_converter)
140140
- Redesign of the automatic tile generator with python language [mkbathy.py](https://github.com/Field-Robotics-Lab/Bathymetry_Converter/blob/a6fa5ba1549e15a17eb7869f6103e907b9f4394a/mkbathy.py)
141141
- Automatic color texture generation with bathymetry depth
142142

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

146146
- Mud Plugin
@@ -151,7 +151,7 @@ This changelog covers the entire dave project which includes a few repositories,
151151
- 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)
152152
- Addition and configuration of multiple arms onboard arbitrary robot. [dave PR #206](https://github.com/Field-Robotics-Lab/dave/pull/206)
153153
- 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)
154-
- Documentation and tutorial [wiki](https://github.com/Field-Robotics-Lab/dave/wiki/Bimanual-Manipulation-Setup-and-Examples)
154+
- Documentation and tutorial [wiki](https://github.com/Field-Robotics-Lab/dave/wiki/Bimanual-Manipulation-Setup-and-Examples)
155155

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

0 commit comments

Comments
 (0)