From 16c6ed90f37695de9fea704eb513f2f5e96ae5aa Mon Sep 17 00:00:00 2001 From: Andreas Heinrich Date: Wed, 8 May 2024 13:39:32 +0200 Subject: [PATCH 1/4] test Signed-off-by: Andreas Heinrich --- docker/images/build-kit/alpine.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/images/build-kit/alpine.Dockerfile b/docker/images/build-kit/alpine.Dockerfile index efffd36..4013811 100644 --- a/docker/images/build-kit/alpine.Dockerfile +++ b/docker/images/build-kit/alpine.Dockerfile @@ -72,7 +72,7 @@ RUN python3 -m pip install \ gcovr==5.0 # install ev-cli -RUN python3 -m pip install git+https://github.com/EVerest/everest-utils@4a5ce956722929325cef3c2d73a8919c6d2e4013#subdirectory=ev-dev-tools +RUN python3 -m pip install git+https://github.com/EVerest/everest-utils@81c4018fdda4e9d6224e42a07174dc4f68513c8e#subdirectory=ev-dev-tools # install edm RUN python3 -m pip install git+https://github.com/EVerest/everest-dev-environment@v0.5.5#subdirectory=dependency_manager From 308f6900b27828f39778c55d19e403642e308ce1 Mon Sep 17 00:00:00 2001 From: Andreas Heinrich Date: Mon, 13 May 2024 17:12:57 +0200 Subject: [PATCH 2/4] bump ev-cli Signed-off-by: Andreas Heinrich --- docker/images/build-kit/alpine.Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/images/build-kit/alpine.Dockerfile b/docker/images/build-kit/alpine.Dockerfile index 4013811..7fc3762 100644 --- a/docker/images/build-kit/alpine.Dockerfile +++ b/docker/images/build-kit/alpine.Dockerfile @@ -72,7 +72,8 @@ RUN python3 -m pip install \ gcovr==5.0 # install ev-cli -RUN python3 -m pip install git+https://github.com/EVerest/everest-utils@81c4018fdda4e9d6224e42a07174dc4f68513c8e#subdirectory=ev-dev-tools +ARG GIT_VERSION=2adb9542cac28b72765a5edc0cc5569c93fa9c5f +RUN python3 -m pip install git+https://github.com/EVerest/everest-utils@${GIT_VERSION}#subdirectory=ev-dev-tools # install edm RUN python3 -m pip install git+https://github.com/EVerest/everest-dev-environment@v0.5.5#subdirectory=dependency_manager From 4fb5f7c2ab21a454cb75dd4dee1d2ee698a92115 Mon Sep 17 00:00:00 2001 From: Andreas Heinrich Date: Thu, 16 May 2024 13:17:53 +0200 Subject: [PATCH 3/4] update Signed-off-by: Andreas Heinrich --- docker/images/build-kit/alpine.Dockerfile | 4 ++-- docker/images/build-kit/debian.Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docker/images/build-kit/alpine.Dockerfile b/docker/images/build-kit/alpine.Dockerfile index 7fc3762..c81dbe6 100644 --- a/docker/images/build-kit/alpine.Dockerfile +++ b/docker/images/build-kit/alpine.Dockerfile @@ -72,8 +72,8 @@ RUN python3 -m pip install \ gcovr==5.0 # install ev-cli -ARG GIT_VERSION=2adb9542cac28b72765a5edc0cc5569c93fa9c5f -RUN python3 -m pip install git+https://github.com/EVerest/everest-utils@${GIT_VERSION}#subdirectory=ev-dev-tools +ARG EV_CLI_VERSION=v0.2.3 +RUN python3 -m pip install git+https://github.com/EVerest/everest-utils@${EV_CLI_VERSION}#subdirectory=ev-dev-tools # 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 828d53f..a79d1f0 100644 --- a/docker/images/build-kit/debian.Dockerfile +++ b/docker/images/build-kit/debian.Dockerfile @@ -64,7 +64,8 @@ RUN python3 -m pip install \ gcovr==5.0 # install ev-cli -RUN python3 -m pip install git+https://github.com/EVerest/everest-utils@4a5ce956722929325cef3c2d73a8919c6d2e4013#subdirectory=ev-dev-tools +ARG EV_CLI_VERSION=v0.2.3 +RUN python3 -m pip install git+https://github.com/EVerest/everest-utils@${EV_CLI_VERSION}#subdirectory=ev-dev-tools # install edm RUN python3 -m pip install git+https://github.com/EVerest/everest-dev-environment@v0.5.5#subdirectory=dependency_manager From 5030bba4f01ea6449749a5060747b0d1a80c18f4 Mon Sep 17 00:00:00 2001 From: Andreas Heinrich Date: Thu, 16 May 2024 13:26:51 +0200 Subject: [PATCH 4/4] rename docker arg Signed-off-by: Andreas Heinrich --- docker/images/build-kit/alpine.Dockerfile | 4 ++-- docker/images/build-kit/debian.Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/images/build-kit/alpine.Dockerfile b/docker/images/build-kit/alpine.Dockerfile index c81dbe6..f67f479 100644 --- a/docker/images/build-kit/alpine.Dockerfile +++ b/docker/images/build-kit/alpine.Dockerfile @@ -72,8 +72,8 @@ RUN python3 -m pip install \ gcovr==5.0 # install ev-cli -ARG EV_CLI_VERSION=v0.2.3 -RUN python3 -m pip install git+https://github.com/EVerest/everest-utils@${EV_CLI_VERSION}#subdirectory=ev-dev-tools +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 # 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 a79d1f0..ccee54d 100644 --- a/docker/images/build-kit/debian.Dockerfile +++ b/docker/images/build-kit/debian.Dockerfile @@ -64,8 +64,8 @@ RUN python3 -m pip install \ gcovr==5.0 # install ev-cli -ARG EV_CLI_VERSION=v0.2.3 -RUN python3 -m pip install git+https://github.com/EVerest/everest-utils@${EV_CLI_VERSION}#subdirectory=ev-dev-tools +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 # install edm RUN python3 -m pip install git+https://github.com/EVerest/everest-dev-environment@v0.5.5#subdirectory=dependency_manager