From 58337ed4afd4395e99aa556fb75708ffb4a56e39 Mon Sep 17 00:00:00 2001 From: Andreas Heinrich Date: Fri, 17 May 2024 09:21:45 +0200 Subject: [PATCH 1/3] * Add install build * Do not install ev-cli Signed-off-by: Andreas Heinrich --- docker/images/build-kit/alpine.Dockerfile | 7 ++----- docker/images/build-kit/debian.Dockerfile | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/docker/images/build-kit/alpine.Dockerfile b/docker/images/build-kit/alpine.Dockerfile index 03a38f8..12f7e4d 100644 --- a/docker/images/build-kit/alpine.Dockerfile +++ b/docker/images/build-kit/alpine.Dockerfile @@ -70,11 +70,8 @@ RUN python3 -m pip install \ py4j>=0.10.9.5 \ netifaces>=0.11.0 \ python-dateutil>=2.8.2 \ - gcovr==5.0 - -# install ev-cli -ARG EVEREST_UTILS_VERSION=v0.2.3 -RUN python3 -m pip install git+https://github.com/EVerest/everest-utils@${EVEREST_UTILS_VERSION}#subdirectory=ev-dev-tools + gcovr==5.0 \ + build # install edm RUN python3 -m pip install git+https://github.com/EVerest/everest-dev-environment@v0.5.5#subdirectory=dependency_manager diff --git a/docker/images/build-kit/debian.Dockerfile b/docker/images/build-kit/debian.Dockerfile index ccee54d..b44c392 100644 --- a/docker/images/build-kit/debian.Dockerfile +++ b/docker/images/build-kit/debian.Dockerfile @@ -61,11 +61,8 @@ RUN python3 -m pip install \ py4j>=0.10.9.5 \ netifaces>=0.11.0 \ python-dateutil>=2.8.2 \ - gcovr==5.0 - -# install ev-cli -ARG EVEREST_UTILS_VERSION=v0.2.3 -RUN python3 -m pip install git+https://github.com/EVerest/everest-utils@${EVEREST_UTILS_VERSION}#subdirectory=ev-dev-tools + gcovr==5.0 \ + build # install edm RUN python3 -m pip install git+https://github.com/EVerest/everest-dev-environment@v0.5.5#subdirectory=dependency_manager From 3be9ce1b0e52cac2d7f2da537e188b5494eb30d1 Mon Sep 17 00:00:00 2001 From: Andreas Heinrich Date: Thu, 13 Jun 2024 05:20:04 +0200 Subject: [PATCH 2/3] bump everest-cmake Signed-off-by: Andreas Heinrich --- docker/images/build-kit/alpine.Dockerfile | 2 +- docker/images/build-kit/debian.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/images/build-kit/alpine.Dockerfile b/docker/images/build-kit/alpine.Dockerfile index 12f7e4d..f524ee8 100644 --- a/docker/images/build-kit/alpine.Dockerfile +++ b/docker/images/build-kit/alpine.Dockerfile @@ -81,7 +81,7 @@ RUN git clone https://github.com/EVerest/everest-cmake.git $EVEREST_CMAKE_PATH RUN ( \ cd $EVEREST_CMAKE_PATH \ - git checkout 329f8db \ + git checkout v0.3.0 \ rm -r .git \ ) diff --git a/docker/images/build-kit/debian.Dockerfile b/docker/images/build-kit/debian.Dockerfile index b44c392..dde7603 100644 --- a/docker/images/build-kit/debian.Dockerfile +++ b/docker/images/build-kit/debian.Dockerfile @@ -72,7 +72,7 @@ RUN git clone https://github.com/EVerest/everest-cmake.git $EVEREST_CMAKE_PATH RUN ( \ cd $EVEREST_CMAKE_PATH \ - git checkout 329f8db \ + git checkout v0.3.0 \ rm -r .git \ ) From 3cb7a6ca44de092f0f31b3e83fa53012472959ab Mon Sep 17 00:00:00 2001 From: Andreas Heinrich Date: Fri, 14 Jun 2024 09:12:10 +0200 Subject: [PATCH 3/3] Apply suggestions from code review Signed-off-by: Andreas Heinrich --- docker/images/build-kit/alpine.Dockerfile | 2 +- docker/images/build-kit/debian.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/images/build-kit/alpine.Dockerfile b/docker/images/build-kit/alpine.Dockerfile index f524ee8..a9dc399 100644 --- a/docker/images/build-kit/alpine.Dockerfile +++ b/docker/images/build-kit/alpine.Dockerfile @@ -81,7 +81,7 @@ RUN git clone https://github.com/EVerest/everest-cmake.git $EVEREST_CMAKE_PATH RUN ( \ cd $EVEREST_CMAKE_PATH \ - git checkout v0.3.0 \ + git checkout v0.4.0 \ rm -r .git \ ) diff --git a/docker/images/build-kit/debian.Dockerfile b/docker/images/build-kit/debian.Dockerfile index dde7603..2a0287c 100644 --- a/docker/images/build-kit/debian.Dockerfile +++ b/docker/images/build-kit/debian.Dockerfile @@ -72,7 +72,7 @@ RUN git clone https://github.com/EVerest/everest-cmake.git $EVEREST_CMAKE_PATH RUN ( \ cd $EVEREST_CMAKE_PATH \ - git checkout v0.3.0 \ + git checkout v0.4.0 \ rm -r .git \ )