aboutsummaryrefslogtreecommitdiff
path: root/docker/base
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2021-01-28 10:06:00 +0100
committerMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2021-03-10 11:15:18 +0100
commitbe544f4e66a6d0dbaa0c26e4565ccfe6a2548838 (patch)
treebc91df80513ec75fbd94b27d76448552d9968dcb /docker/base
parent92da935331b4ca9ca29f392455a71afd0ee7f198 (diff)
downloadkolla-be544f4e66a6d0dbaa0c26e4565ccfe6a2548838.tar.gz
kolla-be544f4e66a6d0dbaa0c26e4565ccfe6a2548838.zip
switch to CentOS 8 Stream
We use official CentOS 8 Stream image as a base. So far Stream does not have own SIG repos RDO Wallaby packages will be built against Stream Kolla CI jobs are renamed to centos8s. Kolla-Ansible ones will follow in later patch. Change-Id: Ibb23c9d0caf115fcbba7bd322ecebe8d80b6821a
Diffstat (limited to 'docker/base')
-rw-r--r--docker/base/Dockerfile.j26
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 2af50509f..151e86440 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -143,7 +143,10 @@ RUN if [[ -e /etc/yum.repos.d/rabbitmq_rabbitmq-server.repo ]]; then \
'glibc-all-langpacks'
] %}
-RUN {{ macros.install_packages(base_centos_language_packages | customizable("centos_language_packages"), chain=True, clean=False) }} \
+# NOTE(hrw): this macro file drops all languages other than C.UTF-8 so horizon fails
+# https://bugzilla.redhat.com/show_bug.cgi?id=1729770
+RUN rm -f /etc/rpm/macros.image-language-conf \
+ && {{ macros.install_packages(base_centos_language_packages | customizable("centos_language_packages"), chain=True, clean=False) }} \
&& {{ macros.rpm_security_update(clean_package_cache) }}
{% endblock %}
@@ -248,6 +251,7 @@ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("cen
'ca-certificates',
'curl',
'findutils',
+ 'hostname',
'iproute',
'iscsi-initiator-utils',
'lvm2',