diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-06 19:55:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-06 19:55:14 +0000 |
| commit | 4e7de488f32dc8de4cf487ed4c33def832188bd7 (patch) | |
| tree | da2e26817187b5b753946194cf6a1ccee5d9072d /docker | |
| parent | faea5b91141406c82bd2e029da9aeeb9afa8a200 (diff) | |
| parent | 053044a85753e09056561130b67fcfdc41e9c1eb (diff) | |
| download | kolla-4e7de488f32dc8de4cf487ed4c33def832188bd7.tar.gz kolla-4e7de488f32dc8de4cf487ed4c33def832188bd7.zip | |
Merge "Improve bash command used in bifrost-base image"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/bifrost/bifrost-deploy/Dockerfile.j2 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/docker/bifrost/bifrost-deploy/Dockerfile.j2 b/docker/bifrost/bifrost-deploy/Dockerfile.j2 index 3b5a54fb4..1f8897eb2 100644 --- a/docker/bifrost/bifrost-deploy/Dockerfile.j2 +++ b/docker/bifrost/bifrost-deploy/Dockerfile.j2 @@ -9,14 +9,14 @@ ENV container docker {% if base_distro in ['centos', 'oraclelinux', 'rhel', 'debian'] or (base_distro == 'ubuntu' and base_distro_tag == '16.04') %} -RUN bash -c ' $(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ \"$i\" == \"systemd-tmpfiles-setup.service\" ] || rm -f $i; done); \ -rm -f /lib/systemd/system/multi-user.target.wants/*;\ -rm -f /etc/systemd/system/*.wants/*;\ -rm -f /lib/systemd/system/local-fs.target.wants/*; \ -rm -f /lib/systemd/system/sockets.target.wants/*udev*; \ -rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \ -rm -f /lib/systemd/system/basic.target.wants/*;\ -rm -f /lib/systemd/system/anaconda.target.wants/*;' +RUN rm -f $(find /lib/systemd/system/sysinit.target.wants/ ! -name systemd-tmpfiles-setup.service -type l); \ + rm -f /lib/systemd/system/multi-user.target.wants/*; \ + rm -f /etc/systemd/system/*.wants/*; \ + rm -f /lib/systemd/system/local-fs.target.wants/*; \ + rm -f /lib/systemd/system/sockets.target.wants/*udev*; \ + rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \ + rm -f /lib/systemd/system/basic.target.wants/*; \ + rm -f /lib/systemd/system/anaconda.target.wants/*; {% elif base_distro in ['ubuntu'] %} |