Browse Source

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
(cherry picked from commit 3c435cb078)
changes/81/749881/1
Michal Nasiadka 3 weeks ago
committed by Radosław Piliszek
parent
commit
965a288da2
2 changed files with 15 additions and 0 deletions
  1. +9
    -0
      docker/base/Dockerfile.j2
  2. +6
    -0
      kolla/image/build.py

+ 9
- 0
docker/base/Dockerfile.j2 View File

@@ -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() %}
@@ -391,6 +397,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 \


+ 6
- 0
kolla/image/build.py View File

@@ -95,6 +95,9 @@ SKIPPED_IMAGES = {
"zun-base",
],
'centos+source': [
# FIXME(yoctozepto): temporary block due to upstream issues
"bifrost-base",

"ovsdpdk",
"searchlight-base",
# TODO(jeffrey4l): remove tripleo-ui when following bug is fixed
@@ -132,6 +135,9 @@ SKIPPED_IMAGES = {
"zun-base",
],
'ubuntu+source': [
# FIXME(yoctozepto): temporary block due to upstream issues
"bifrost-base",

# There is no qdrouterd package for ubuntu bionic
"qdrouterd",
"searchlight-base",


Loading…
Cancel
Save