diff options
| author | Mark Goddard <mark@stackhpc.com> | 2020-03-16 15:16:31 +0000 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-04-15 14:17:40 +0100 |
| commit | 788978211326093e10795c611971ca8911e2a986 (patch) | |
| tree | 988b081b5d4973bbf93b037a82f540bd6bd28986 /docker/bifrost | |
| parent | 53443c5c712f4ec23b859105e94bcd90abc27762 (diff) | |
| download | kolla-788978211326093e10795c611971ca8911e2a986.tar.gz kolla-788978211326093e10795c611971ca8911e2a986.zip | |
CentOS 8: Switch last mentions of yum to dnf
Change-Id: I31e9742793cfb1abff9749083c9ce86000dae1af
Partially-Implements: blueprint centos-rhel-8
Diffstat (limited to 'docker/bifrost')
| -rw-r--r-- | docker/bifrost/bifrost-base/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2 index 9efeef674..72521cbe2 100644 --- a/docker/bifrost/bifrost-base/Dockerfile.j2 +++ b/docker/bifrost/bifrost-base/Dockerfile.j2 @@ -34,7 +34,7 @@ WORKDIR /bifrost {% if base_package_type == 'rpm' %} {# Remove updated RabbitMQ packages since these are not supported by Bifrost yet. #} RUN rm -f /etc/yum.repos.d/rabbitmq_rabbitmq-server.repo \ - && yum clean all && rm -rf /var/yum/cache + && dnf clean all && rm -rf /var/dnf/cache {% elif base_package_type == 'deb' %} RUN sed -e "s/.*mariadb.*//Ig" -e "s/.*rabbitmq.*//Ig" -i /etc/apt/sources.list \ && apt-get purge -y mariadb* mysql* @@ -55,7 +55,7 @@ RUN echo " " && \ {%- if base_package_type == 'deb' %} apt-get clean && rm -rf /var/lib/apt/lists/*' {%- else %} - yum clean all && rm -rf /var/yum/cache' + dnf clean all && rm -rf /var/dnf/cache' {%- endif %} {% endblock %} {% endif %} |