Skip to content

Commit aa3e06c

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Time mismatch in /etc/localtime and /etc/timezone"
2 parents e3a33aa + 2d8e98e commit aa3e06c

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

docker/base/Dockerfile.j2

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,9 @@ RUN apt-get --error-on=any update \
335335
&& locale-gen "$LANG" \
336336
&& apt-get -y upgrade \
337337
&& apt-get -y dist-upgrade \
338-
&& {{ macros.install_packages(base_apt_packages | customizable('apt_packages'), True) }}
338+
&& {{ macros.install_packages(base_apt_packages | customizable('apt_packages'), True) }} \
339+
# NOTE: python3-pip installs dependent tzdata package and blocks mount in docker - 2091161
340+
&& unlink /etc/localtime
339341

340342
{% endblock %}
341343

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
fixes:
3+
- |
4+
Python3-pip installs the dependent package tzdata and
5+
blocks the mount of the /etc/localtime file in docker.
6+
`LP#2091161 <https://launchpad.net/bugs/2081149>`__

0 commit comments

Comments
 (0)