diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2020-08-28 12:20:02 +0200 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2020-09-03 10:06:09 +0000 |
| commit | 3c435cb0781b343ad7f7223609cf2eefb2f8738a (patch) | |
| tree | 3c063b6bfa582b99c1cb282865c9e2c95577ca51 | |
| parent | 7038e3ff03c6d08e7b794f9087675964ddbbed0a (diff) | |
| download | kolla-3c435cb0781b343ad7f7223609cf2eefb2f8738a.tar.gz kolla-3c435cb0781b343ad7f7223609cf2eefb2f8738a.zip | |
Fix ironic build issues - LANG related
ironic drivers-requirements installation fails with:
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc5 in position 2:
ordinal not in range(128)
Squashed ,,cherry-pick'' from stable/train - adding LANG block and locale-gen
for Ubuntu family in base Dockerfile:
https://review.opendev.org/#/c/684808/
https://review.opendev.org/#/c/691835/
https://review.opendev.org/#/c/694099/
Temporarily blocks bifrost building as well - to revert!
Change-Id: I79ee884ad35bf5166c9ea303d73416271ff5f637
| -rw-r--r-- | docker/base/Dockerfile.j2 | 9 | ||||
| -rwxr-xr-x | kolla/image/build.py | 6 |
2 files changed, 15 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 13ed739eb..8ecba073c 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -1,6 +1,12 @@ FROM {{ base_image }}:{{ base_distro_tag }} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% block base_lang %} +# NOTE(yoctozepto): use a UTF-8 (Unicode) locale like standard image installs do +# fixes issues arising from ascii fallback usage +ENV LANG en_US.UTF-8 +{% endblock %} + {# NOTE(SamYaple): Avoid uid/gid conflicts by creating each user/group up front. #} {# Specifics required such as homedir or shell are configured within the service specific image #} {%- for name, user in users | dictsort() %} @@ -378,6 +384,9 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom {% endfor %} {% endblock %} RUN apt-get update \ + && apt-get -y install locales \ + && sed -e "s/# $LANG UTF-8/$LANG UTF-8/g" /etc/locale.gen -i \ + && locale-gen "$LANG" \ && apt-get -y upgrade \ && apt-get -y dist-upgrade \ && apt-get -y install --no-install-recommends \ diff --git a/kolla/image/build.py b/kolla/image/build.py index 7496573ea..6703bbae4 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -97,6 +97,9 @@ SKIPPED_IMAGES = { "zun-base", ], 'centos+source': [ + # FIXME(yoctozepto): temporary block due to upstream issues + "bifrost-base", + "ovsdpdk", "tripleoclient", # TODO(jeffrey4l): remove tripleo-ui when following bug is fixed @@ -136,6 +139,9 @@ SKIPPED_IMAGES = { "zun-base", ], 'ubuntu+source': [ + # FIXME(yoctozepto): temporary block due to upstream issues + "bifrost-base", + "crane", "cyborg-base", # There is no qdrouterd package for ubuntu bionic |
