diff options
| author | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2022-09-11 12:46:28 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-09-27 10:04:19 +0000 |
| commit | 9dd9f425b7cbef3986facb965dc1866e8cb59175 (patch) | |
| tree | 36e841c507a910c284f0d6489d3051128cad3cb1 /docker | |
| parent | 878b00013b01e3d02a704ce7c9fac1629cd1a705 (diff) | |
| download | kolla-9dd9f425b7cbef3986facb965dc1866e8cb59175.tar.gz kolla-9dd9f425b7cbef3986facb965dc1866e8cb59175.zip | |
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
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | 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 13af63149..0d3159778 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 7c4fed946..2aa536cca 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 %} |