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 | |
| 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')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/bifrost/bifrost-base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/cyborg/cyborg-agent/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/logstash/Dockerfile.j2 | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index a0a0ffebe..07dcc9461 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -51,11 +51,13 @@ RUN CURRENT_DISTRO_RELEASE=$(awk '{match($0, /[0-9]+/,version)}END{print version && cat /tmp/kolla_bashrc >> /etc/bashrc \ && sed -i 's|^\(override_install_langs=.*\)|# \1|' /etc/dnf/dnf.conf +{% block base_dnf_conf %} {% block base_yum_conf %} COPY dnf.conf /etc/dnf/dnf.conf {% endblock %} +{% endblock %} # Install what is needed for en_US.UTF-8 {% block base_centos_distro_sync_and_languages %} 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 %} diff --git a/docker/cyborg/cyborg-agent/Dockerfile.j2 b/docker/cyborg/cyborg-agent/Dockerfile.j2 index 97e3790dd..c50c5fc9f 100644 --- a/docker/cyborg/cyborg-agent/Dockerfile.j2 +++ b/docker/cyborg/cyborg-agent/Dockerfile.j2 @@ -39,7 +39,7 @@ RUN curl -sSL -o /tmp/opae-libs.rpm ${opae_libs_rpm_url} \ && echo "${opae_libs_rpm_sha1sum} /tmp/opae-libs.rpm" | sha1sum -c \ && curl -sSL -o /tmp/opae-devel.rpm ${opae_devel_rpm_url} \ && echo "${opae_devel_rpm_sha1sum} /tmp/opae-devel.rpm" | sha1sum -c \ - && yum -y install /tmp/opae-libs.rpm /tmp/opae-devel.rpm \ + && dnf -y install /tmp/opae-libs.rpm /tmp/opae-devel.rpm \ && rm -f /tmp/opae-libs.rpm /tmp/opae-devel.rpm # NOTE(Bai Yongjun) Required packages are only supported Ubuntu16.04 diff --git a/docker/logstash/Dockerfile.j2 b/docker/logstash/Dockerfile.j2 index 66a77296b..3e8bcdb1f 100644 --- a/docker/logstash/Dockerfile.j2 +++ b/docker/logstash/Dockerfile.j2 @@ -47,7 +47,7 @@ ENV logstash_rpm_url=https://download.elastic.co/logstash/logstash/packages/cent ENV logstash_rpm_sha1sum=68c5e78c3d941f06f77d638c0756b6aea715bec5 RUN curl -sSL -o /tmp/logstash.rpm ${logstash_rpm_url} \ && echo "${logstash_rpm_sha1sum} /tmp/logstash.rpm" | sha1sum -c \ - && yum -y install /tmp/logstash.rpm \ + && dnf -y install /tmp/logstash.rpm \ && rm -f /tmp/logstash.rpm {% elif base_package_type == 'deb' %} |