diff --git a/Dockerfile b/Dockerfile index 3e6ac8b..6b54b7a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN git clone https://github.com/ahamilton/eris RUN cd eris && git checkout d83bea2ba8a419e2b3cd4fd4b3367e25fae6339d RUN rm -rf eris/.git RUN DEBIAN_FRONTEND=noninteractive apt install -y tzdata -RUN cd eris && ./install-dependencies -RUN python3.9 -m pip install ./eris +RUN cd eris && python3.9 -m pip install -r requirements.txt . +RUN cd eris && ./install-tools ENTRYPOINT ["eris"] diff --git a/README.md b/README.md index 9d27b22..003043c 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,8 @@ Eris maintains an up-to-date set of reports for every file in a codebase. # git clone https://github.com/ahamilton/eris # cd eris - # ./install-dependencies - # python3.9 -m pip install . + # python3.9 -m pip install -r requirements.txt . + # ./install-tools # eris -h ### Docker diff --git a/install-dependencies b/install-dependencies deleted file mode 100755 index a742f07..0000000 --- a/install-dependencies +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - - -set -e - - -DIST_ID=$(cat /etc/os-release | grep "^ID=" | cut -d "=" -f 2) -if [ $DIST_ID != "ubuntu" ]; then - echo "Eris can only be installed on Ubuntu." - exit 1 -fi -echo "Installing the dependencies of the eris script…" -sudo apt --yes install python3-pip python3.9 util-linux -python3.9 -m pip install -r requirements.txt -echo -echo "Installing all the tools eris may need…" -./install-tools diff --git a/make-appimage.py b/make-appimage.py index 3f3180b..1176be9 100755 --- a/make-appimage.py +++ b/make-appimage.py @@ -69,8 +69,8 @@ def make_ubuntu_base(): def install_eris(): - run_in_container("ubuntu", "./install-dependencies") - run_in_container("ubuntu", "pip3 install -I .") + run_in_container("ubuntu", "python3.9 -m pip install -r requirements.txt .") + run_in_container("ubuntu", "./install-tools") def make_app_dir(app_dir, new_paths): diff --git a/make-readme.py b/make-readme.py index 702641c..00cc696 100755 --- a/make-readme.py +++ b/make-readme.py @@ -27,8 +27,8 @@ Eris maintains an up-to-date set of reports for every file in a codebase. # git clone https://github.com/ahamilton/eris # cd eris - # ./install-dependencies - # python3.9 -m pip install . + # python3.9 -m pip install -r requirements.txt . + # ./install-tools # eris -h ### Docker