kolla/docker/kolla-toolbox/Dockerfile.j2
Steven Dake a577634fd3 Reorder operations of mkdir and useradd in toolbox
The home directory for Ansible already exists and does not
need to be created.  Reorder useradd and mkdir at suggestion
of Jeff Peeler to avoid warning.

The warning looks like this:

INFO:__main__:kolla-toolbox:Step 6 : RUN mkdir -p /etc/ansible /usr/share/ansible /home/ansible     && echo 'localhost ansible_connection=local' > /etc/ansible/hosts     && useradd --user-group ansible --groups kolla     && sed -i 's|  "identity_api_version": "2.0",|  "identity_api_version": "3",|' /usr/lib/python2.7/site-packages/os_client_config/defaults.json
INFO:__main__:kolla-toolbox: ---> Running in ccded9c01fca
INFO:__main__:kolla-toolbox:useradd: warning: the home directory already exists.
INFO:__main__:kolla-toolbox:Not copying any file from skel directory into it.
INFO:__main__:kolla-toolbox:

TrivialFix

Change-Id: I031ade6597f8071f5be1768a7e70b1008dd94e52
2016-03-17 13:30:28 -07:00

62 lines
1.7 KiB
Django/Jinja

FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \
gcc \
git \
libffi-devel \
libxml2-devel \
libxslt-devel \
MariaDB-devel \
openssl-devel \
python-devel \
openssh-clients \
&& yum clean all \
&& rpm -e --nodeps pytz
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN apt-get -y --no-install-recommends install \
build-essential \
ca-certificates \
git \
libffi-dev \
libmariadbclient-dev \
libssl-dev \
libxslt1-dev \
python-dev \
&& apt-get clean
{% endif %}
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
&& python get-pip.py \
&& rm get-pip.py \
&& pip --no-cache-dir install \
MySQL-python \
os-client-config==1.16.0 \
pyudev \
shade==1.4.0
RUN git clone https://github.com/ansible/ansible.git \
&& cd ansible \
&& git checkout 89569d035ea5002302a0a6b03451a4963fd83eb3 \
&& git submodule update --init --recursive \
&& pip --no-cache-dir install .
RUN useradd --user-group ansible --groups kolla \
&& mkdir -p /etc/ansible /usr/share/ansible \
&& echo 'localhost ansible_connection=local' > /etc/ansible/hosts \
&& sed -i 's| "identity_api_version": "2.0",| "identity_api_version": "3",|' /usr/lib/python2.7/site-packages/os_client_config/defaults.json
COPY find_disks.py kolla_keystone_service.py kolla_keystone_user.py kolla_sanity.py kolla_zookeeper.py /usr/share/ansible/
COPY ansible.cfg /home/ansible/.ansible.cfg
CMD ["/bin/sleep", "infinity"]
{{ include_footer }}
USER ansible