Docker + Z-Wave <3

paczek137 · Feb 29, 2016 · 029094e · 029094e
1 parent 28d80e6
commit 029094e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git 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
@@ -21,4 +21,4 @@ fi
 
 git checkout python3
 PYTHON_EXEC=`which python3` make build
-sudo PYTHON_EXEC=`which python3` make install
+PYTHON_EXEC=`which python3` make install