diff options
Diffstat (limited to 'docker/solum')
| -rw-r--r-- | docker/solum/solum-base/Dockerfile.j2 | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/docker/solum/solum-base/Dockerfile.j2 b/docker/solum/solum-base/Dockerfile.j2 index 2fae22e9d..af7f5ca0c 100644 --- a/docker/solum/solum-base/Dockerfile.j2 +++ b/docker/solum/solum-base/Dockerfile.j2 @@ -3,6 +3,10 @@ MAINTAINER {{ maintainer }} {% block solum_base_header %}{% endblock %} +{% import "macros.j2" as macros with context %} + +{{ macros.configure_user(name='solum') }} + {% if install_type == 'binary' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ @@ -12,18 +16,16 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ ADD solum-base-archive /solum-base-source RUN ln -s solum-base-source/* solum \ - && useradd --user-group solum \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /solum \ - && mkdir -p /etc/solum /home/solum \ + && mkdir -p /etc/solum \ && cp -r /solum/etc/solum/* /etc/solum/ \ - && chown -R solum: /etc/solum /home/solum + && chown -R solum: /etc/solum {% endif %} COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN usermod -a -G kolla solum \ - && touch /usr/local/bin/kolla_solum_extend_start \ +RUN touch /usr/local/bin/kolla_solum_extend_start \ && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_solum_extend_start {% block solum_base_footer %}{% endblock %} |