From 029094e549466a550512f0db8eb2a8fda58e7f3a Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sun, 28 Feb 2016 20:46:16 -0800 Subject: [PATCH] Docker + Z-Wave <3 --- Dockerfile | 10 +++------- script/build_python_openzwave | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0d41841f4529..b49275b02401 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,19 +6,15 @@ VOLUME /config RUN mkdir -p /usr/src/app WORKDIR /usr/src/app -RUN pip3 install --no-cache-dir colorlog +RUN pip3 install --no-cache-dir colorlog cython # For the nmap tracker RUN apt-get update && \ - apt-get install -y --no-install-recommends nmap net-tools && \ + apt-get install -y --no-install-recommends nmap net-tools cython3 libudev-dev && \ apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* COPY script/build_python_openzwave script/build_python_openzwave -RUN apt-get update && \ - apt-get install -y cython3 libudev-dev && \ - apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ - pip3 install "cython<0.23" && \ - script/build_python_openzwave +RUN script/build_python_openzwave COPY requirements_all.txt requirements_all.txt RUN pip3 install --no-cache-dir -r requirements_all.txt diff --git a/script/build_python_openzwave b/script/build_python_openzwave index 1653bb963301..2a5283c44bdb 100755 --- a/script/build_python_openzwave +++ b/script/build_python_openzwave @@ -21,4 +21,4 @@ fi git checkout python3 PYTHON_EXEC=`which python3` make build -sudo PYTHON_EXEC=`which python3` make install \ No newline at end of file +PYTHON_EXEC=`which python3` make install