Moved some tools to base-tools container. Add netifaces python lib.
All tools, libs, etc should be in base-tools container. Base image should not be toched in the most cases. Change-Id: I023dc4e8663b2e24c0757a1537358c2a320f8725
This commit is contained in:
parent
38a9669c6b
commit
3f038ac994
|
@ -3,6 +3,11 @@ MAINTAINER {{ maintainer }}
|
|||
|
||||
# This will prevent questions from being asked during the install
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
COPY requirements.txt /tmp/requirements.txt
|
||||
|
||||
RUN apt-get install -y --no-install-recommends netcat lvm2 open-iscsi tgt vim less patch \
|
||||
&& apt-get clean
|
||||
RUN apt-get install -y --no-install-recommends netcat lvm2 open-iscsi tgt vim less patch gcc python-dev \
|
||||
&& apt-get clean \
|
||||
&& pip install --no-cache-dir -r /tmp/requirements.txt \
|
||||
&& rm /tmp/requirements.txt \
|
||||
&& apt-get -y purge gcc python-dev \
|
||||
&& apt-get -y autoremove
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
Jinja2>=2.8 # BSD License (3 clause)
|
||||
python-etcd
|
||||
netifaces
|
||||
PyYAML>=3.1.0 # MIT
|
||||
six>=1.9.0 # MIT
|
|
@ -6,7 +6,6 @@ ENV DEBIAN_FRONTEND noninteractive
|
|||
|
||||
COPY sources.list.debian /etc/apt/sources.list
|
||||
COPY apt_preferences.debian /etc/apt/preferences
|
||||
COPY requirements.txt /tmp/requirements.txt
|
||||
|
||||
# Ceph and Mariadb keys
|
||||
RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 08B73419AC32B4E966C1A330E84AC2C0460F3994 \
|
||||
|
@ -19,9 +18,7 @@ RUN apt-get update \
|
|||
&& curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
|
||||
&& python get-pip.py \
|
||||
&& rm get-pip.py \
|
||||
&& apt-get clean \
|
||||
&& pip install --no-cache-dir -r /tmp/requirements.txt \
|
||||
&& rm /tmp/requirements.txt
|
||||
&& apt-get clean
|
||||
|
||||
COPY sudoers /etc/sudoers
|
||||
RUN chmod 440 /etc/sudoers \
|
||||
|
|
Loading…
Reference in New Issue