2e6d2f144c
1. When cyborg images build completed, the /etc/cyborg folder is not exits, and there is not confs, especially the api-paste.ini 2. When masakari images build completed, it's configs is missing, this ps add them together cyborg should keep consistence with the other images[1], this PS to add it. [1]: https://github.com/openstack/kolla/blob/master/docker/nova/nova-base/Dockerfile.j2#L137 Change-Id: I8a802617952f80cfb9f906398054ef6d17559589
41 lines
1.1 KiB
Django/Jinja
41 lines
1.1 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
|
|
{% block labels %}
|
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
|
{% endblock %}
|
|
|
|
{% block cyborg_header %}{% endblock %}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{{ macros.configure_user(name='cyborg') }}
|
|
|
|
{% if install_type == 'binary' %}
|
|
|
|
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
|
|
&& /bin/false
|
|
|
|
{% elif install_type == 'source' %}
|
|
|
|
ADD cyborg-base-archive /cyborg-base-source
|
|
|
|
{% set cyborg_base_pip_packages = [
|
|
'/cyborg'
|
|
] %}
|
|
|
|
RUN ln -s cyborg-base-source/* cyborg \
|
|
&& {{ macros.install_pip(cyborg_base_pip_packages | customizable("pip_packages")) }} \
|
|
&& mkdir -p /etc/cyborg/ \
|
|
&& cp -r /cyborg/etc/cyborg/* /etc/cyborg/
|
|
|
|
{% endif %}
|
|
|
|
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
|
COPY cyborg_sudoers /etc/sudoers.d/kolla_cyborg_sudoers
|
|
|
|
RUN chmod 750 /etc/sudoers.d \
|
|
&& touch /usr/local/bin/kolla_cyborg_extend_start \
|
|
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_cyborg_extend_start
|
|
|
|
{% block cyborg_footer %}{% endblock %}
|
|
{% block footer %}{% endblock %}
|