diff options
| author | Zuul <zuul@review.opendev.org> | 2025-01-02 11:01:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-01-02 11:01:29 +0000 |
| commit | aa3e06cd33ef9a469d51d5da41e29d304e42fcfb (patch) | |
| tree | 3737e5882eee8baf6bbed8c97d2ebac51f1b7160 /docker | |
| parent | e3a33aae3abf66df4f31ef2c35b9597d051babc0 (diff) | |
| parent | 2d8e98ec7b49e864559f5ac4b6339de7eb006a21 (diff) | |
| download | kolla-aa3e06cd33ef9a469d51d5da41e29d304e42fcfb.tar.gz kolla-aa3e06cd33ef9a469d51d5da41e29d304e42fcfb.zip | |
Merge "Time mismatch in /etc/localtime and /etc/timezone"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index fc6e1683a..e6947f498 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -335,7 +335,9 @@ RUN apt-get --error-on=any update \ && locale-gen "$LANG" \ && apt-get -y upgrade \ && apt-get -y dist-upgrade \ - && {{ macros.install_packages(base_apt_packages | customizable('apt_packages'), True) }} + && {{ macros.install_packages(base_apt_packages | customizable('apt_packages'), True) }} \ + # NOTE: python3-pip installs dependent tzdata package and blocks mount in docker - 2091161 + && unlink /etc/localtime {% endblock %} |