aboutsummaryrefslogtreecommitdiff
path: root/docker/kolla-toolbox
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-04-22 08:46:55 +0000
committerGerrit Code Review <review@openstack.org>2022-04-22 08:46:55 +0000
commit7cb4f7d01c5e61ebd5f324822e41910564d5563f (patch)
tree0991b7f2611dee2380df9cbe203df436f07c4be2 /docker/kolla-toolbox
parent8650c57c12498c483445536af5b5a85ada87791e (diff)
parente21aeb5ae955671937055baf57836120af8d4312 (diff)
downloadkolla-7cb4f7d01c5e61ebd5f324822e41910564d5563f.tar.gz
kolla-7cb4f7d01c5e61ebd5f324822e41910564d5563f.zip
Merge "flatten images a bit"
Diffstat (limited to 'docker/kolla-toolbox')
-rw-r--r--docker/kolla-toolbox/Dockerfile.j211
1 files changed, 5 insertions, 6 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index 630464658..283fd77a1 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -95,14 +95,13 @@ ENV ANSIBLE_LIBRARY /usr/share/ansible:$ANSIBLE_LIBRARY
COPY find_disks.py /usr/share/ansible/
COPY ansible.cfg /etc/ansible/ansible.cfg
-RUN chmod 644 /usr/share/ansible/find_disks.py \
- /etc/ansible/ansible.cfg
-
COPY ansible_sudoers /etc/sudoers.d/kolla_ansible_sudoers
-RUN chmod 440 /etc/sudoers.d/kolla_ansible_sudoers
-
COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 644 /usr/local/bin/kolla_extend_start
+
+RUN chmod 644 /usr/share/ansible/find_disks.py \
+ /etc/ansible/ansible.cfg \
+ /usr/local/bin/kolla_extend_start \
+ && chmod 440 /etc/sudoers.d/kolla_ansible_sudoers
{% block kolla_toolbox_footer %}{% endblock %}
{% block footer %}{% endblock %}