aboutsummaryrefslogtreecommitdiff
path: root/docker/horizon/Dockerfile.j2
AgeCommit message (Collapse)AuthorFilesLines
2016-11-10Fix neutron lbaas dashboardJeffrey Zhang1-4/+4
Load neutron lbaas dynamic when neutron lbaas is enabled. Change-Id: I47913824fea87b721f254633c16d1dc6903b4f5d Closes-Bug: #1639325
2016-11-05Run collect static during container startup when necessarilyJeffrey Zhang1-3/+0
Other dashboard may need run collect static action when enabled. TrivialFix Change-Id: I60ffa29283f45850f11d75f2f8fd4ab9dd62484a
2016-11-03Remove Fedora supportChristian Berendt1-2/+2
Closes-bug: #1616387 Change-Id: Id97f88b9baa3d48d33ce120962450a374282d044
2016-09-13Add header blocks to all DockerfilesPaul Bourke1-0/+2
Change needed to add header blocks to all Dockerfiles, similar to the base. Use case is to easily run something before packages are installed, e.g. to COPY a local rpm in that can be added to the package list. Change-Id: I1bbfdf0b762da0a392aa8bf47781315b45377bee Closes-Bug: 1618969
2016-08-31Install neutron-lbaas-dashboard from source in horizon containerChristian Berendt1-0/+6
Change-Id: I9bc0288dd436eaaa48c8fd27e0907bbb8dadfe2c Partial-bug: #1592446 Co-authored-by: Shaun Smekel <shaun.smekel@theorem.net.au>
2016-08-19Merge "Optimize horizon cache and compress for http response"Jenkins1-0/+1
2016-08-19Handle empty package list for install_packagesShaun Smekel1-4/+4
Currently if the install_packages macro is run with an empty package list, it will add a yum or apt-get command with no packages listed. This bug fix aims to omit this line when no packages have been given, or, the operator wants to use the "_override" / "_remove" functionality to disable all packages being installed in a Dockerfile. Co-Authored-By: Paul Bourke <paul.bourke@oracle.com> Change-Id: Ifaaaebfccc3adb0f2f68a35ac08e59378bc87fdb Closes-bug: 1612446
2016-08-09Optimize horizon cache and compress for http responseJeffrey Zhang1-0/+1
Leverage the browser cache and compress to speed up the file transfer. In RHEL based image, the expire and deflate module are enabled in default. In the Debian based image, only the deflate is enabled * Enable expire module on the Debian based image * Enable the expire for the assets resource * Enable the deflate for the http response Closes-Bug: #1605907 Change-Id: If25decc38a10a21929f72a89cdb350d4ac64a5a9
2016-08-03Customizations for HorizonPaul Bourke1-32/+54
Change-Id: I8134cc96cb37e04984d15f3799c8caba21c90bfe Partially-implements: blueprint third-party-plugin-support
2016-05-31Merge "Set ServerTokens parameter to 'Prod' for Ubuntu Apache config"Jenkins1-0/+1
2016-05-26Set ServerTokens parameter to 'Prod' for Ubuntu Apache configChristian Berendt1-0/+1
The default value of the ServerTokens parameter is OS by default when using Ubuntu as base image. This results in "Server: Apache/2.4.7 (Ubuntu)" as server signature. Setting the parameter to "Prod" produces a less verbose server signature. Change-Id: I9a1422890cc667423bde73ea2dd7be143eb8b04a Partial-bug: #1586112
2016-05-26Merge "Update ubuntu dockerfiles for formatting"Jenkins1-2/+2
2016-05-26Merge "Update the horizon dockerfile for formatting"Jenkins1-1/+1
2016-05-26Update ubuntu dockerfiles for formattingSwapnil Kulkarni (coolsvap)1-2/+2
Change-Id: If4be00b937e14ec93443dcb7249cf17099d57cbe Closes-Bug: #1569417
2016-05-23Compile the messages in the horizonJeffrey Zhang1-2/+12
Change-Id: Ic5d4a3dbd5efcd1337bafae0e2b0bf67d90cd1e5 Closes-Bug: #1574008
2016-05-18Update the horizon dockerfile for formattingSwapnil Kulkarni (coolsvap)1-1/+1
Change-Id: Iacea37d84a57d1543f6332a8b600d431dc2c6270 Partial-Bug:#1569417
2016-03-04Fix horizon with sslSamYaple1-3/+5
Ubuntu did not have mod_headers enabled by default Remove unused variable and adjust 'when' conditional positioning TrivialFix Change-Id: I82b8724526c24f4481a80165520d624f6a02c336
2016-01-27Re-generate the compressed css and js on every horizon startJeffrey Zhang1-4/+1
The local_settings file affect django-compress behavior, so re-generate the compressed javascript and css if it is changed Closes-Bug: #1537815 Change-Id: I330bfb666e39ffb88a4488793562df697d5572d0
2016-01-11Horizon ubuntu binary containerArtur Zarzycki1-0/+22
Change-Id: Ie11456e2b1e9bf641f7739044e8ae13d78405427 Partially-Implements: blueprint binary-ubuntu
2015-12-27Fix pip install settingsSamYaple1-1/+1
There were some inconsistencies with pip install instructions thoughout Kolla. We fix those here. Additionally, we fix the virtualenv to properly use the site-packages on the host if a library is not available in the venv. Change-Id: Ib84d48e8826bb96060338b3fa0782620c98794a8 Related-Bug: #1524684 Closes-Bug: #1529434
2015-12-11Fix owner of horizon docrootProskurin Kirill1-2/+2
Horizon starts WSGI deamon from user "horizon", its docroot has "root" user. Change-Id: Iac424a88a747772a37b2ff2ae94f302a988f7201 Closes-Bug: 1525296
2015-11-27Source installation in virtualenvMichal Rostecki1-6/+6
Use virtualenv for installation of OpenStack projects and dependencies to avoid conflicts with Python libraries installed by non-OpenStack binary packages. Change-Id: I21ecd673b2e93335b1d3dd4e279e940c9d694c3c Implements: blueprint virtualenv
2015-11-23Remove hardcoded MAINTAINER in DockerfilesSwapnil Kulkarni (coolsvap)1-1/+1
Added new option in kolla-build.conf Change-Id: I45fe51966bcb59ea19d112281ba3d5a1ba091a56 Closes-Bug:#1514304
2015-11-13Revert "Drop root for Horizon service"Sam Yaple1-19/+1
This reverts commit f9ccb1c8829cef551b875c7c387530e7980414a7. There are many issues with this patch that prevents it from working under numerous circumstances. The implementation is entirely busted on Ubuntu. Additionally, best practice for apache is to run as root. Apache itself does the privlege dropping. Change-Id: I4395debb7d32223fb3752a6d3e7c4d7672d29916
2015-11-12Move USER operation after footerSam Yaple1-2/+2
The USER operation affects all docker commands after it. This causes a problem with our {{ include_footer }} implementation since commands in that footer may require elevated permissions to perform. In the current implementation I can no longer remove my proxy settings once the USER has been changed. Change-Id: I9b2bab5a15f595f6d52a46c64ddf59ba5608b938 Partially-Implements: blueprint drop-root
2015-11-11Drop root for Horizon serviceSteven Dake1-1/+19
Drop root privileges for Horizon service. It is necesssary to set a capability on the filesystem to allow binding to port 80 as a non-root user. I have tested this works correctly from a registry on both CentOS and Ubuntu. Change-Id: I4c26f28bb28b6633784e6842f3423a2425332c27 Partially-Implements: blueprint drop-root
2015-11-11Install keystoneauthv1 in openstack-base imageSteven Dake1-1/+0
Lots of tools rqeuire keystoneeauthv1 not just horizon TrivialFix Change-Id: I35eb958e35500b04657679371019f2e6f3c2f2dd
2015-11-10Horizon rdo package requires python-keystoneauth1Martin André1-0/+1
Change-Id: I0d98399d7d573ea43689746dda59a647c307b25f Closes-Bug: #1514697
2015-11-09Fix validate-all-maintainer.sh to look for Dockerfile.j2Angus Salkeld1-1/+1
And fix the fallout. Change-Id: Iccad3f4fdb0a6a7c14246df3408cae0425b833a5
2015-10-15Use openstack/requirements for horizonPaul Bourke1-1/+1
See Iccb4e99f8e4b6659a19c1817d0f4c697824af25c for context. Change-Id: I145908bef5d18fea35f38032725f48c18f8cb831 Partial-Bug: #150530
2015-10-06Common start.shSam Yaple1-3/+2
The majority of the start.sh code is identical. This removes that duplicate code while still maintaining the ability to call code in a specific container. The start.sh is moved into /usr/local/bin/kolla_start in the container The extend_start.sh script is called by the kolla_start script at the location /usr/local/bin/kolla_extend_start . It always exists because we create a noop kolla_extend_start in the base directory. We override it with extend_start.sh in a specific image should we need to. Of note, the neutron-agents container is exempt from this new structure due to it being a fat container. Additionally, we fix the inconsistent permissions throughout. 644 for repo files and the scripts are set to 755 via a Docker RUN command to ensure someones local perm change won't break upstream containers. Change-Id: I7da8d19965463ad30ee522a71183e3f092e0d6ad Closes-Bug: #1501295
2015-09-28Implement a install_type and install_metatypeSteven Dake1-1/+1
This prepares for the RHEL OSP implementation by making the build tool convert all binary-* into an install_type of binary and * into an install_metatype variable substitution inside the Dockerfiles. Further binary-* is substituted as install_name to enable proper building only. Change-Id: Ib681b29176eb79a3cab12ec824313fdecb6e7a5f Partially-Implements: blueprint rhel-based-image-support
2015-09-27Remove all fail sections for UbuntuSam Yaple1-8/+0
Ubuntu binary is not supported and may never be. Installing from cloud-archive packaging is only for the current stable distros, Ubuntu does not have a Delorean type repo. We place a fail message in the base image to catch this and remove the messages throughout the project. An additional fail message is placed to catch all other things. Change-Id: Id2953f503ebd42226f6a08e75979ae56511c40f7 Implements: blueprint install-from-ubuntu
2015-09-25Fix removal of config-externalSam Yaple1-1/+0
I removed the files but not the COPY commands thus breaking all of Kolla Change-Id: I37d3e0cb94a1ecc12971f485f953310ba8fee53c Partially-Implements: blueprint replace-config-external
2015-09-21Remove pip install of pyscss in HorizonSteven Dake1-1/+0
Because of the correction of the dependney repos in RDO, pyscss no longer needs to be installed via pip. Change-Id: Ide0a0181a9b1353a043956ab9849a2d261f1c243 Closes-Bug: #1497436
2015-09-04Add 'rhel' for RPM distrosSteven Dake1-2/+2
Add 'rhel' to list for RPM based distros. Also sort the distro list for rpm packages for affected lines. Change-Id: Ied4cb3e9763d6c6359f314d16185383ac3e006ed Partially-Implements: blueprint rhel-based-image-support
2015-09-04Merge "Allow arbitrary source archive name to be imported into Dockerfile"Jenkins1-2/+2
2015-09-03Allow arbitrary source archive name to be imported into DockerfileVladislav Belogrudov1-2/+2
Currently we cannot import source archives with names different than expected by hardcoded line in Dockerfiles. This worked well for Openstack services' tarballs where we expected SERVICE-* root folder after extraction or kanaka-noVNC for nova-novncproxy docker. The latter fails if one tries to clone or get tarball under other names. This fix allows any archive (tar,tgz,zip) or repo name to be imported into dockerfile. Change-Id: I869a6a19afaf0e93925572746c22b7589b6600c9 Closes-Bug: #1491415
2015-09-03Create openstack-base containerSam Yaple1-1/+1
This creates and moves the dependencies for Ubuntu into a common openstack-base container. This commit shows dramatically smaller sizes for all non-openstack containers. The Openstack container remain the same size. Change-Id: I2f46420d4b9edcfddda374caddcce906fc708f6c Partially-Implements: blueprint openstack-common-container
2015-08-29Make Horizon work on centos+binarySteven Dake1-6/+21
Several problems exist with Horizon on centos+binary: 1. The default setup of http binds a port to port 80 on RPM based distros. 2. There is no horizon user/group added causing config-external to break badly. 3. openstack-dashboard is installed in /usr/share/openstack-dashboard/openstack_dashboard. This is incompatible with the expectations of the wsgi configuration. 4. the target for config-external is /etc/httpd/sites.d/horizon.conf. It should be /etc/httpd/conf.d/horizon.conf 5. A workaround is required for: https://bugzilla.redhat.com/show_bug.cgi?id=1220070 6. Static display requires compressing the installation via manage.py. To do this correctly pyscss needs to be upgraded because the version in RDO is broken. Co-Authored-By: Sam Yaple <sam@yaple.net> Change-Id: Iabd3044906920f5cc60b9a6b320e62d1d7c9210f Closes-Bug: #1490066
2015-08-28Move docker_templates to docker dirSam Yaple1-0/+58
Updated build.py to reflect this change. Deprecate --template option and make it a noop. Change-Id: I7cd98d1ee684a4c64984a49597159868152683b2 Partially-Implements: blueprint remove-docker-dir