Merge docker python fix

2018-04-16 13:50:16 +02:00 · 2018-04-16 13:50:16 +02:00 · 8b27c0f071
parent d1172a7179
commit 8b27c0f071
1 changed files with 5 additions and 0 deletions
--- a/5
+++ b/5
@ -45,6 +45,11 @@ RUN apt-get update && apt-get install -qy \
    apt-utils \
    lsb-core \
    python2.7 \
+<<<<<<< HEAD
+=======
+    python-dev \ 
+  && ln -sf /usr/bin/python2.7 /usr/bin/python \
+>>>>>>> 4207760... Fix for ln: python : file exists
  && rm -rf /var/lib/apt/lists/*

 # build empire from source