Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

1993 fix pip platform appimage #2007

Merged
merged 6 commits into from
Jun 9, 2022
Merged

1993 fix pip platform appimage #2007

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b8a5245
Build: Use `pipenv sync --system` instead of requirements.txt
mssalvatore Jun 9, 2022
f7ad99f
Build: Handle errors if pushd or popd fail
mssalvatore Jun 9, 2022
1b6856b
Build: Double quote variables to prevent splitting
mssalvatore Jun 9, 2022
cd1d7b2
Build: Use braces to expand array
mssalvatore Jun 9, 2022
73d20a6
Build: Uninstall pipenv from AppImage after dependencies are installed
mssalvatore Jun 9, 2022
cacd064
Build: Uninstall pipenv and virtualenv after dependencies are installed
mssalvatore Jun 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 12 additions & 19 deletions build_scripts/appimage/appimage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
LINUXDEPLOY_URL="https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
PYTHON_VERSION="3.7.13"
PYTHON_APPIMAGE_URL="https://github.com/niess/python-appimage/releases/download/python3.7/python${PYTHON_VERSION}-cp37-cp37m-manylinux1_x86_64.AppImage"
APPIMAGE_DIR="$(realpath $(dirname $BASH_SOURCE[0]))"
APPIMAGE_DIR=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
APPDIR="$APPIMAGE_DIR/squashfs-root"
BUILD_DIR="$APPDIR/usr/src"

Expand All @@ -30,7 +30,7 @@ setup_build_dir() {
local deployment_type=$3
local is_release_build=$4

pushd $APPIMAGE_DIR
pushd "$APPIMAGE_DIR" || handle_error

setup_python_37_appdir

Expand All @@ -50,7 +50,7 @@ setup_build_dir() {

remove_python_appdir_artifacts

popd
popd || handle_error
}

setup_python_37_appdir() {
Expand Down Expand Up @@ -79,20 +79,13 @@ install_monkey_island_python_dependencies() {
log_message "Installing pipenv"
"$APPDIR"/AppRun -m pip install pipenv || handle_error

requirements_island="$BUILD_DIR/monkey_island/requirements.txt"
generate_requirements_from_pipenv_lock "$requirements_island"
log_message "Installing dependencies"
pushd "$BUILD_DIR/monkey_island" || handle_error
"$APPDIR"/AppRun -m pipenv --python "$APPDIR/AppRun" sync --system || handle_error
popd || handle_error

log_message "Installing island python requirements"
"$APPDIR"/AppRun -m pip install -r "${requirements_island}" --ignore-installed || handle_error
}

generate_requirements_from_pipenv_lock () {
local requirements_island=$1

log_message "Generating a requirements.txt file with 'pipenv requirements'"
pushd "$BUILD_DIR/monkey_island"
"$APPDIR"/AppRun -m pipenv --python "$APPDIR/AppRun" requirements --hash > "$requirements_island" || handle_error
popd
log_message "Uninstalling pipenv (build dependency only)"
"$APPDIR"/AppRun -m pip uninstall --yes pipenv virtualenv || handle_error
}


Expand All @@ -115,7 +108,7 @@ build_package() {

log_message "Building AppImage"

pushd "$APPIMAGE_DIR"
pushd "$APPIMAGE_DIR" || handle_error
ARCH="x86_64" linuxdeploy \
--appdir "$APPIMAGE_DIR/squashfs-root" \
--icon-file "$ICON_PATH" \
Expand All @@ -125,9 +118,9 @@ build_package() {
--output appimage

dst_name="InfectionMonkey-$version.AppImage"
move_package_to_dist_dir $dist_dir $dst_name
move_package_to_dist_dir "$dist_dir" "$dst_name"

popd
popd || handle_error
}

move_package_to_dist_dir() {
Expand Down