diff --git a/klipper/Dockerfile b/klipper/Dockerfile index 0ea784f..b47e76b 100644 --- a/klipper/Dockerfile +++ b/klipper/Dockerfile @@ -9,7 +9,7 @@ ARG MOONRAKER_VENV_DIR=${HOME}/moonraker-env RUN useradd -d ${HOME} -ms /bin/bash ${USER} RUN apt-get update && \ - apt-get install -y locales git sudo wget curl gzip tar virtualenv python-dev libffi-dev build-essential libncurses-dev libusb-dev gpiod python3-virtualenv python3-dev libopenjp2-7 python3-libgpiod liblmdb0 libsodium-dev + apt-get install -y locales git sudo wget curl gzip tar python2 virtualenv python-dev libffi-dev build-essential libncurses-dev libusb-dev gpiod python3-virtualenv python3-dev libopenjp2-7 python3-libgpiod liblmdb0 libsodium-dev RUN sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen RUN locale-gen @@ -24,14 +24,14 @@ WORKDIR ${HOME} RUN git clone https://github.com/KevinOConnor/klipper.git RUN sed -i 's/0.4.15/0.4.17/g' klipper/scripts/klippy-requirements.txt RUN sed -i 's/1.12.2/1.12.3/g' klipper/scripts/klippy-requirements.txt -RUN [ ! -d ${KLIPPER_VENV_DIR} ] && virtualenv ${KLIPPER_VENV_DIR} +RUN [ ! -d ${KLIPPER_VENV_DIR} ] && virtualenv -p 2 ${KLIPPER_VENV_DIR} RUN ${KLIPPER_VENV_DIR}/bin/python -m pip install pip -U RUN ${KLIPPER_VENV_DIR}/bin/pip install wheel RUN ${KLIPPER_VENV_DIR}/bin/pip install -r klipper/scripts/klippy-requirements.txt # Install moonraker RUN git clone https://github.com/Arksine/moonraker.git -RUN [ ! -d ${MOONRAKER_VENV_DIR} ] && python3 -m venv ${MOONRAKER_VENV_DIR} +RUN [ ! -d ${MOONRAKER_VENV_DIR} ] && virtualenv -p 3 ${MOONRAKER_VENV_DIR} RUN ${MOONRAKER_VENV_DIR}/bin/python -m pip install pip -U RUN ${MOONRAKER_VENV_DIR}/bin/pip install wheel gpiod