From fa2fc02e355f946480516ed31044b7922b23dc45 Mon Sep 17 00:00:00 2001 From: Shankari Date: Wed, 13 Nov 2024 17:00:48 -0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=E2=99=BB=EF=B8=8F=20Use=20recommen?= =?UTF-8?q?ded=20image=20+=20use=20standard=20script?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - The alpine build-kit is now deprecated, use the recommended one https://github.com/EVerest/everest-demo/issues/78#issuecomment-2472224963 ``` --------------------------------------------- WARNING This docker image is depreacted. Please use the debian based build-kit 'ghcr.io/everest/everest-ci/build-kit-base' instead. Fore more information see https://github.com/EVerest/everest-ci/pull/22 --------------------------------------------- ``` - Now that there is a standard install script, instead of only test-and-install, so that we can roll forward https://github.com/EVerest/everest-demo/issues/78#issuecomment-2473888451 Testing done: - Built successfully using a container - Ran the `everest-demo/docker-compose.yml` and `everest-demo/docker-compose.iso15118-dc.yml` scripts. Both worked. - Testing `everest-demo/docker-compose.ocpp201.yml` fails because go is running into SSL issues on my work laptop. Need to figure out how to resolve that https://github.com/EVerest/everest-demo/issues/78#issuecomment-2475127681 Signed-off-by: Shankari --- manager/Dockerfile | 8 +++----- manager/install.sh | 8 -------- 2 files changed, 3 insertions(+), 13 deletions(-) delete mode 100755 manager/install.sh diff --git a/manager/Dockerfile b/manager/Dockerfile index 4c089b70..820917e6 100644 --- a/manager/Dockerfile +++ b/manager/Dockerfile @@ -1,19 +1,17 @@ -FROM ghcr.io/everest/build-kit-alpine:v1.4.2 +FROM ghcr.io/everest/everest-ci/build-kit-base:v1.4.2 ARG EVEREST_VERSION=2024.9.0 ENV EVEREST_VERSION=${EVEREST_VERSION} -COPY install.sh ./ - # Cloning the repo now and copying files over RUN git clone https://github.com/EVerest/everest-core.git \ && cd everest-core \ && git checkout ${EVEREST_VERSION} \ && cd .. \ && mkdir -p /ext/scripts \ - && mv install.sh /ext/scripts/install.sh \ + && cp -r everest-core/.ci/build-kit/scripts/* /ext/scripts/ \ && mv everest-core /ext/source \ - # Don't run the test-and-install script since it deletes the build directory! + && /entrypoint.sh run-script compile \ && /entrypoint.sh run-script install # Copy over the custom config *after* compilation and installation diff --git a/manager/install.sh b/manager/install.sh deleted file mode 100755 index 64a01649..00000000 --- a/manager/install.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -cd /ext/source \ -&& mkdir build \ -&& cd build \ -&& cmake -DBUILD_TESTING=ON ..\ -&& make install -j6 \ -&& make install_everest_testing \