Merge docker python fix
parent
d1172a7179
commit
8b27c0f071
|
@ -45,6 +45,11 @@ RUN apt-get update && apt-get install -qy \
|
||||||
apt-utils \
|
apt-utils \
|
||||||
lsb-core \
|
lsb-core \
|
||||||
python2.7 \
|
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/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# build empire from source
|
# build empire from source
|
||||||
|
|
Loading…
Reference in New Issue