From a96efcdc7d484071ad3bc113cf77a8a78f705f79 Mon Sep 17 00:00:00 2001 From: Ilija Lazoroski Date: Wed, 17 Aug 2022 14:29:23 +0200 Subject: [PATCH 1/2] Build: Downgrade pipenv to use 2022.7.4 It seems that every time a new version of pipenv is released, it breaks our build. See also 01e886f866. --- build_scripts/appimage/appimage.sh | 2 +- build_scripts/docker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build_scripts/appimage/appimage.sh b/build_scripts/appimage/appimage.sh index a7415593c..eeba3cb9f 100755 --- a/build_scripts/appimage/appimage.sh +++ b/build_scripts/appimage/appimage.sh @@ -77,7 +77,7 @@ install_monkey_island_python_dependencies() { log_message "Installing island requirements" log_message "Installing pipenv" - "$APPDIR"/AppRun -m pip install pipenv || handle_error + "$APPDIR"/AppRun -m pip install pipenv==2022.7.4 || handle_error log_message "Installing dependencies" pushd "$BUILD_DIR/monkey_island" || handle_error diff --git a/build_scripts/docker/Dockerfile b/build_scripts/docker/Dockerfile index ecd2ce296..0e9a8bec9 100644 --- a/build_scripts/docker/Dockerfile +++ b/build_scripts/docker/Dockerfile @@ -6,7 +6,7 @@ WORKDIR /monkey RUN virtualenv . RUN . bin/activate && \ cd monkey_island && \ - pip install pipenv && \ + pip install pipenv==2022.7.4 && \ pipenv sync From 8355d9e68a56b1037face3bff1991cf1b2e2207c Mon Sep 17 00:00:00 2001 From: Ilija Lazoroski Date: Wed, 17 Aug 2022 14:52:17 +0200 Subject: [PATCH 2/2] Buid: Export CI to get rid of nasty characters --- build_scripts/appimage/appimage.sh | 1 + build_scripts/docker/Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/build_scripts/appimage/appimage.sh b/build_scripts/appimage/appimage.sh index eeba3cb9f..9666374d5 100755 --- a/build_scripts/appimage/appimage.sh +++ b/build_scripts/appimage/appimage.sh @@ -78,6 +78,7 @@ install_monkey_island_python_dependencies() { log_message "Installing pipenv" "$APPDIR"/AppRun -m pip install pipenv==2022.7.4 || handle_error + export CI=1 log_message "Installing dependencies" pushd "$BUILD_DIR/monkey_island" || handle_error diff --git a/build_scripts/docker/Dockerfile b/build_scripts/docker/Dockerfile index 0e9a8bec9..084acbeae 100644 --- a/build_scripts/docker/Dockerfile +++ b/build_scripts/docker/Dockerfile @@ -4,6 +4,7 @@ FROM bitnami/python:3.7 as builder COPY ./monkey /monkey WORKDIR /monkey RUN virtualenv . +RUN export CI=1 RUN . bin/activate && \ cd monkey_island && \ pip install pipenv==2022.7.4 && \