From b97e75f9889e8ea9e208f1e819dbdb981037464b Mon Sep 17 00:00:00 2001 From: Ryan Friedman Date: Thu, 17 Aug 2023 23:13:51 -0600 Subject: [PATCH] Add pre-commit to the docker environment Signed-off-by: Ryan Friedman --- README.md | 2 +- docker/Dockerfile_dev-base | 2 +- docker/Dockerfile_dev-ros | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e7f4226..63af0e7 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ For daily developpement, you can use the dockerfile provide into ArduPilot direc ### Docker Images -The docker images provide base environment to compile ArduPilot. They don't contain ArduPilot code but only the packages needed to compile the binaries. Each image is based on Ubuntu 20.04 +The docker images provide base environment to compile ArduPilot. They don't contain ArduPilot code but only the packages needed to compile the binaries. Each image is based on Ubuntu 20.04 or 22.04. The main image is [ardupilot-dev-base ](Dockerfile_dev-base). Other images will inherit from it. Each image is specialized to contain only the necessary tools to build the related binaries. diff --git a/docker/Dockerfile_dev-base b/docker/Dockerfile_dev-base index f39bc6f..0e5c919 100644 --- a/docker/Dockerfile_dev-base +++ b/docker/Dockerfile_dev-base @@ -36,7 +36,7 @@ RUN apt-get update \ && apt-get clean autoclean \ && sudo rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -RUN python -m pip install --no-cache-dir -U future lxml pexpect flake8==4.0.1 pycodestyle==2.8.0 empy pyelftools tabulate +RUN python -m pip install --no-cache-dir -U future lxml pexpect flake8==4.0.1 pycodestyle==2.8.0 empy pyelftools tabulate pre-commit RUN mkdir -p /__w/ardupilot/ardupilot && git config --global --add safe.directory /__w/ardupilot/ardupilot && git config --system --add safe.directory /__w/ardupilot/ardupilot diff --git a/docker/Dockerfile_dev-ros b/docker/Dockerfile_dev-ros index 8547d89..280e62f 100644 --- a/docker/Dockerfile_dev-ros +++ b/docker/Dockerfile_dev-ros @@ -36,7 +36,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \ && apt-get clean autoclean \ && sudo rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -RUN python -m pip install --no-cache-dir -U future lxml pexpect flake8 empy pyelftools tabulate pymavlink +RUN python -m pip install --no-cache-dir -U future lxml pexpect flake8 empy pyelftools tabulate pymavlink pre-commit FROM eclipse-temurin:19-jdk-jammy as dds-gen-builder