diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-05-12 09:42:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-05-12 09:42:06 +0000 |
| commit | e860e6cd4af92282201f3b0964e7eb3806175e35 (patch) | |
| tree | d933818ae95ee41d57e2b4e4d9f762e8bfc3c48b | |
| parent | 2e438918384447d52c958d61b9a377c375ec932b (diff) | |
| parent | 1aca75111df1fbf65908fecd01a695699c7833a1 (diff) | |
| download | kolla-e860e6cd4af92282201f3b0964e7eb3806175e35.tar.gz kolla-e860e6cd4af92282201f3b0964e7eb3806175e35.zip | |
Merge "Fix Incorrect timezone in ubuntu horizon images"
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 56847d33b..92ee2cd99 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -50,11 +50,13 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ 'apache2', 'gettext', 'libapache2-mod-wsgi', + 'locales', 'openstack-dashboard', 'python-manila-ui', 'python-murano-dashboard', 'python-sahara-dashboard', - 'python-trove-dashboard' + 'python-trove-dashboard', + 'tzdata' ] %} {{ macros.install_packages(horizon_packages | customizable("packages")) }} @@ -99,7 +101,9 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ {% set horizon_packages = [ 'apache2', 'gettext', - 'libapache2-mod-wsgi' + 'libapache2-mod-wsgi', + 'locales', + 'tzdata' ] %} {{ macros.install_packages(horizon_packages | customizable("packages")) }} |