diff options
| author | Zuul <zuul@review.opendev.org> | 2022-09-27 12:37:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-09-27 12:37:18 +0000 |
| commit | 2185f817baf57be9bdb39b3f0dcf3bd05462d3b5 (patch) | |
| tree | cab7d96083057d906aa7f3a170d8cbf9c37b67f1 | |
| parent | 542bbcdb6b2827812e529c29f4a44f542ec1f801 (diff) | |
| parent | 9dd9f425b7cbef3986facb965dc1866e8cb59175 (diff) | |
| download | kolla-2185f817baf57be9bdb39b3f0dcf3bd05462d3b5.tar.gz kolla-2185f817baf57be9bdb39b3f0dcf3bd05462d3b5.zip | |
Merge "Don't ignore the remaining apt-get update errors"
| -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 1da98d7fc..792863d03 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 %} |