Apply suggested changes from review comments

Signed-off-by: Andreas Heinrich <andreas.heinrich@rwth-aachen.de>
EVerest · Jul 17, 2024 · 2d7d8ee · 2d7d8ee
1 parent b7b5581
commit 2d7d8ee
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 23 deletions.
diff --git a/docker/deprecated-images/build-kit/deprecated_wrapper b/docker/deprecated-images/build-kit/deprecated_wrapper
@@ -5,7 +5,7 @@ function print_warning {
     echo "---------------------------------------------"
     echo "WARNING"
     echo "This docker image is depreacted."
-    echo "Please use the debian based build-kit instead 'ghcr.io/everest/everest-ci/build-kit-base' instead."
+    echo "Please use the debian based build-kit 'ghcr.io/everest/everest-ci/build-kit-base' instead."
     echo "Fore more information see https://github.com/EVerest/everest-ci/pull/22"
     echo "---------------------------------------------"
     echo -e "\033[0m"

diff --git a/docker/images/build-env-base/Dockerfile b/docker/images/build-env-base/Dockerfile
@@ -41,11 +41,7 @@ RUN apt update \
     # required by packet sniffer module
     pkg-config=1.8.1-1 \
     libpcap-dev=1.10.3-1 \
-    libcap-dev=1:2.66-4 \
-    # required by RiseV2G
-    maven=3.8.7-1 \
-    libxml2-dev=2.9.14+dfsg-1.3~deb12u1 \
-    libxslt1-dev=1.1.35-1
+    libcap-dev=1:2.66-4
 
 # Install Python packages
 RUN apt update \
@@ -68,13 +64,13 @@ RUN python3 -m pip install --break-system-packages \
     gcovr==7.2
 
 # Install EVerest dependency manager
-ARG EDM_VERSION=v0.5.5
+ARG EDM_VERSION=v0.6.2
 RUN python3 -m pip install --break-system-packages \
     git+https://github.com/EVerest/everest-dev-environment@${EDM_VERSION}#subdirectory=dependency_manager
 
 # Install everest-cmake
 ARG EVEREST_CMAKE_PATH=/usr/lib/cmake/everest-cmake
-ARG EVEREST_CMAKE_VERSION=v0.4.2
+ARG EVEREST_CMAKE_VERSION=v0.4.3
 RUN git clone https://github.com/EVerest/everest-cmake.git ${EVEREST_CMAKE_PATH} \
     && cd ${EVEREST_CMAKE_PATH} \
     && git checkout ${EVEREST_CMAKE_VERSION} \

diff --git a/docker/images/build-kit-base/Dockerfile b/docker/images/build-kit-base/Dockerfile
@@ -3,13 +3,9 @@ ARG BASE_IMAGE_TAG=latest
 FROM ghcr.io/everest/everest-ci/build-env-base:${BASE_IMAGE_TAG}
 
 ENV WORKSPACE_PATH=/workspace
-ENV ASSETS_PATH=/assets
 ARG EXT_MOUNT=/ext
 ENV EXT_MOUNT=$EXT_MOUNT
 
-RUN mkdir $ASSETS_PATH
-COPY maven-settings.xml $ASSETS_PATH/
-
 COPY ./entrypoint.sh /
 
 # Disable ownership checks

diff --git a/docker/images/build-kit-base/entrypoint.sh b/docker/images/build-kit-base/entrypoint.sh
@@ -3,13 +3,6 @@
 setup_cache(){
     export CPM_SOURCE_CACHE=$EXT_MOUNT/cache/cpm
     export CCACHE_DIR=$EXT_MOUNT/cache/ccache
-
-    maven_cache_dir=$EXT_MOUNT/cache/m2-repo
-
-    # we copy the settings file each time in case the $HOME folder changes
-    mkdir -p $HOME/.m2 || true
-    cp $ASSETS_PATH/maven-settings.xml $HOME/.m2/settings.xml
-    sed -i 's@MAVEN_CACHE_REPOSITORY@'"$maven_cache_dir"'@' $HOME/.m2/settings.xml
 }
 
 # if first cmd is exec we're going to exec what follows

diff --git a/docker/images/build-kit-base/maven-settings.xml b/docker/images/build-kit-base/maven-settings.xml