From 9dd9f425b7cbef3986facb965dc1866e8cb59175 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Sun, 11 Sep 2022 12:46:28 +0000
Subject: [PATCH] Don't ignore the remaining apt-get update errors

Follow-up to I5ce2eb66a647e1805f086aa37942bf5d13eb4106

So far, I have only observed these causing weird errors later but,
in theory, ignoring these could allow the rest of the code to use
archival (so wrong) entries.

Change-Id: I9cef5ceeb78d431ca232c7b196c48eef5d2ccbca
---
 docker/base/Dockerfile.j2                 | 2 +-
 docker/bifrost/bifrost-base/Dockerfile.j2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 13af63149d..0d31597788 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -358,7 +358,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
             {% endif -%}
         {% endfor %}
     {% endblock %}
-RUN apt-get update \
+RUN apt-get --error-on=any update \
     && apt-get -y install locales \
     && sed -e "s/# $LANG UTF-8/$LANG UTF-8/g" /etc/locale.gen -i \
     && locale-gen "$LANG" \
diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2
index 7c4fed9465..2aa536ccac 100644
--- a/docker/bifrost/bifrost-base/Dockerfile.j2
+++ b/docker/bifrost/bifrost-base/Dockerfile.j2
@@ -36,7 +36,7 @@ ENV ANSIBLE_GATHER_TIMEOUT=30
 
 {% block bifrost_ansible_install %}
 {%- if base_package_type == 'deb' %}
-RUN apt-get update && \
+RUN apt-get --error-on=any update && \
 {%- else %}
 RUN echo " " && \
 {%- endif %}