Skip to content

Commit

Permalink
Added some other tools
Browse files Browse the repository at this point in the history
  • Loading branch information
Bob Boggemann committed Nov 7, 2019
1 parent 0a14e8f commit f59b36b
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 4 deletions.
20 changes: 16 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# If the first argument is ...
ifeq (tools_vscode,$(firstword $(MAKECMDGOALS)))
ifneq (,$(findstring tools_,$(firstword $(MAKECMDGOALS))))
# use the rest as arguments
RUN_ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
# ...and turn them into do-nothing targets
Expand Down Expand Up @@ -135,8 +135,8 @@ nvidia_ros_melodic_cuda10_cudnn7: nvidia_ros_melodic_cuda10 ## [NVIDIA] Build RO
docker build -t turlucode/ros-melodic:cuda10-cudnn7 nvidia/melodic/cuda10/cudnn7
@printf "\n\033[92mDocker Image: turlucode/ros-melodic:cuda10-cudnn7\033[0m\n"

nvidia_ros_melodic_cuda10-1_cudnn7: nvidia_ros_melodic_cuda10.1 ## [NVIDIA] Build ROS Melodic Container | (CUDA 10.1 - cuDNN 7)
docker build -t turlucode/ros-melodic:cuda10-cudnn7 nvidia/melodic/cuda10.1/cudnn7
nvidia_ros_melodic_cuda10-1_cudnn7: nvidia_ros_melodic_cuda10-1 ## [NVIDIA] Build ROS Melodic Container | (CUDA 10.1 - cuDNN 7)
docker build -t turlucode/ros-melodic:cuda10.1-cudnn7 nvidia/melodic/cuda10.1/cudnn7
@printf "\n\033[92mDocker Image: turlucode/ros-melodic:cuda10.1-cudnn7\033[0m\n"

## BOUNCY
Expand Down Expand Up @@ -177,4 +177,16 @@ cpu_run_help: ## [CPU] Prints help and hints on how to run an [CPU]-based image

tools_vscode: ## [Tools] Create a new image that contains Visual Studio Code. Use it as "make tools_vscode <existing_docker_image>".
docker build --build-arg="ARG_FROM=$(RUN_ARGS)" -t $(RUN_ARGS)-vscode tools/vscode
@printf "\033[92mDocker Image: $(RUN_ARGS)-vscode\033[0m\n"
@printf "\033[92mDocker Image: $(RUN_ARGS)-vscode\033[0m\n"

tools_canutils: ## [Tools] Create a new image that contains Canutils. Use it as "make tools_canutils <existing_docker_image>".
docker build --build-arg="ARG_FROM=$(RUN_ARGS)" -t $(RUN_ARGS)-canutils tools/canutils
@printf "\033[92mDocker Image: $(RUN_ARGS)-canutils\033[0m\n"

tools_cannelloni: ## [Tools] Create a new image that contains Cannelloni. Use it as "make tools_cannelloni <existing_docker_image>".
docker build --build-arg="ARG_FROM=$(RUN_ARGS)" -t $(RUN_ARGS)-cannelloni tools/cannelloni
@printf "\033[92mDocker Image: $(RUN_ARGS)-cannelloni\033[0m\n"

tools_cpplint: ## [Tools] Create a new image that contains Cpplint. Use it as "make tools_cpplint <existing_docker_image>".
docker build --build-arg="ARG_FROM=$(RUN_ARGS)" -t $(RUN_ARGS)-cpplint tools/cpplint
@printf "\033[92mDocker Image: $(RUN_ARGS)-cpplint\033[0m\n"
15 changes: 15 additions & 0 deletions tools/cannelloni/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
ARG ARG_FROM

FROM $ARG_FROM
MAINTAINER Athanasios Tasoglou <[email protected]>

# Install Cannelloni
RUN git clone https://github.com/mguentner/cannelloni.git && \
cd ./cannelloni && \
mkdir build && cd ./build && \
cmake -DCMAKE_BUILD_TYPE=Release .. && \
make && \
sudo make install

# Launch terminator
CMD ["terminator"]
13 changes: 13 additions & 0 deletions tools/canutils/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
ARG ARG_FROM

FROM $ARG_FROM
MAINTAINER Athanasios Tasoglou <[email protected]>

# Install CanUtils
RUN git clone https://github.com/linux-can/can-utils.git && \
cd ./can-utils && \
mkdir build && cd ./build && \
cmake .. && make && sudo make install

# Launch terminator
CMD ["terminator"]
10 changes: 10 additions & 0 deletions tools/cpplint/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ARG ARG_FROM

FROM $ARG_FROM
MAINTAINER Athanasios Tasoglou <[email protected]>

## Install cpplint (needed for C++ linting with cpplint extension for VS Code)
RUN sudo pip install cpplint

# Launch terminator
CMD ["terminator"]

0 comments on commit f59b36b

Please sign in to comment.