aboutsummaryrefslogtreecommitdiff
path: root/docker/base
AgeCommit message (Collapse)AuthorFilesLines
2017-06-27Introduce merge and preserve_properties for config_filesMartin André1-21/+45
The `merge` option will basically copy all the files recursively inside the container without removing the existing files or directory, while the `preserve_properties` option keeps the file attributes (permissions, ownership, timestamps) in the container. This is useful if you have extracted some config files from a container and want to use them in another container based on the same image. This makes TripleO usage of Kolla much more robust. Change-Id: I78dcec741a941dc21adba33ba33a6dc6ff1d217c
2017-06-21Allow setting copied files group more preciselyMartin André1-26/+22
Previously with the config_files structure of config.json, the group name was automatically set to the one of the user name. It is now possible to set the group name in the same fashion than the 'permissions' structure with: owner: 'desired_owner:desired_group' Closes-Bug: #1696095 Change-Id: Ibae9f74e2351c81a717294467aedc51ea773c41e
2017-06-21Delete unused set_permissions functionMartin André1-40/+0
Change-Id: If6b4a76cf36c639e80a749ec9c938d06435eda51
2017-06-21In set_configs.py support perm parameter in permissions sectionChristian Berendt1-5/+17
This allows to set permissions for configuration files. TrivialFix Change-Id: Ida2ed62eaba8908fb0bd50bb0be00fb5f9b1adc3
2017-06-15Permit changing yum configuration in the base imageMartin André2-0/+13
This commit allows to configure yum settings via a yum.conf file that is shipped in the base image and make it overridable with the base_yum_conf jinja2 block. Change-Id: I76a84ec008fec5696cadefdbdeb4204a32421c4b Closes-Bug: #1698134
2017-06-07Merge "Revert "pin mariadb version for rpm distros""Jenkins1-1/+1
2017-06-02Merge "Remove all Heka related remaining stuff"Jenkins1-7/+0
2017-05-31Revert "pin mariadb version for rpm distros"Eduardo Gonzalez1-1/+1
This reverts commit 331632f879ae9562df84ba499050e1e042196368. Change-Id: I78cf66e53865909442d3b9c9cb441fb24552953e
2017-05-30Sensu imagesMartin Mágr2-0/+9
This patch adds possibility to have container with sensu-client service. Implements: blueprint container-healthchecks Change-Id: I1c659ce38299d5497a80fa96dd2dd39bd40176c3
2017-05-29Remove all Heka related remaining stuffBertrand Lallau1-7/+0
Heka has been removed and replaced by fluentd. Refer to https://review.openstack.org/#/c/437874/ Change-Id: I989e5d71b5ba4d036dd45c02b3923c5bf27a04ed
2017-05-24pin mariadb version for rpm distrosSean Mooney1-2/+2
- This change changes pins to 10.0.30 as MariaDB-Galara-server is not available on the latest z stream of 10.0 - This change enables https be default for the mariadb repo to avoid 404 error. see: https://access.redhat.com/articles/1320623 Change-Id: I92ed4aa3bded0803cb2e7076cefe776d437d8b8d
2017-05-23Merge "Add qdrouterd container"Jenkins2-0/+5
2017-05-18Add qdrouterd containerAndrew Smith2-0/+5
The qdrouterd is a high performance, lightweight AMQP 1.0 message router that support oslo.messaging RPC communications. Change-Id: I42783fb50c9f6750071d797b3f07a6283454c7a7 Implements: blueprint dispatch-router-messaging-component
2017-05-17Revert "Clean up base Dockerfile"Martin André3-329/+328
This reverts commit fd6d89c4953dace9b324c9de8303ec88a21a9710. Change-Id: I93252e459b97b7885432822ff86de6b261c420b2 Related-Bug: #1691413
2017-05-13Clean up base DockerfileMichal (inc0) Jastrzebski3-328/+329
I think this simple change will make it much more readable Change-Id: I369aee3a19d17c134db1d13b94b8c45a44733149
2017-05-11Move shebang customization into jinja2 blockMartin André2-3/+5
By setting up the shebang inside a jinja2 block, this allows the operator to use a different init system of simply disable it. This is especially useful with docker 1.13 that comes with its own stripped down init system (a build of tini) that would cause the containers to run double init systems if used with the '--init' command line argument. Change-Id: I220d8cfc81c25471e635b2f5790759f21e788e64 Closes-Bug: #1680770
2017-05-11Support non-x86 architectures (aarch64, ppc64le)Marcin Juszkiewicz5-24/+132
Based on ppc64le changes by Sajauddin Mohammad [1] 1. https://review.openstack.org/#/c/423239/6 Tested with centos, debian, ubuntu on aarch64 and ppc64le. Partially-Implements: blueprint multiarch-and-arm64-containers Change-Id: If0ccc58d436b2468cd477c222ebc2fe0073206e9
2017-05-09Catch exception during calling os.chmod in set_configs.pyJeffrey Zhang1-1/+7
set_perms may fail in some case, but it is not critical. Just leave a warning rather than exit. Change-Id: I757c7b60611fb6c0547bd1b26ec8a8af03684e5f Closes-Bug: 1689454
2017-05-03Override image's meta info.Jawon Choo1-1/+1
centos based images have wrong label info, these changes fix own image's name and build-date. Change-Id: I1d13f8f386c8db12b5fbe5f8ecbbf9e3fbb4ba1c Closes-Bug: #1680341
2017-04-26Ubuntu: use Pike repositoryMarcin Juszkiewicz1-2/+2
Looks like no one is building Ubuntu images as they were using OpenStack Ocata repositories. Change-Id: Iaaeff50d84c1b42d71de9e24de4b7ab31fafe311
2017-04-20Merge "Use LABEL instead of MAINTAINER (deprecated) in all Dockerfile.j2"Jenkins1-1/+1
2017-04-20Use LABEL instead of MAINTAINER (deprecated) in all Dockerfile.j2Chen1-1/+1
Use LABEL instruction instead of MAINTAINER (deprecated) instruc- tion as suggested by Docker's official dockerfile guide. docs.docker.com/engine/reference/builder/#maintainer-deprecated Closes-Bug: #1683652 Change-Id: Ie87a1ddf31aefcd0b623fd2837d78de420e76898
2017-04-13debian: move to stretchMarcin Juszkiewicz3-52/+3
Debian 'jessie' even with backports lacks some packages Kolla expects. Due to this we (Linaro) move to Debian 'stretch' release with our OpenStack work. Stretch is now frozen so there should not be many changes. Partially-Implements: blueprint multiarch-and-arm64-containers Change-Id: Iab7232cbe6f8fc3e3de10c67f3d89f134b185f05
2017-04-07Add missing Jinja2 block for repo enablementMartin André1-3/+7
Also fix wrong variable name passed to the `customizable` macro that prevented them to be customizable. Change-Id: Iabd040309490c64c2365f55d4bc0beb1a79717f4 Closes-Bug: #1680744
2017-04-04debian: enable all images enabled for UbuntuMarcin Juszkiewicz1-1/+1
Debian support is not maintained in Kolla so it got a bit behind Ubuntu one. This changeset enables Debian for all images. Jessie (even with backports) may be too old for some images though. Also unify distro check to ['debian', 'ubuntu'] to keep alphabetical order like it is done for RPM distributions. Partially-Implements: blueprint multiarch-and-arm64-containers Change-Id: I056233fbfa277e0e2360c07c3f80d9558c554357
2017-04-03Merge "Optimize the code"Jenkins1-20/+19
2017-03-30Optimize the codezhuzeyu1-20/+19
Keeping function code together can make the structure clear Change-Id: Ia16b43b902543bc57869579acba2f6b3d5f2ca54
2017-03-28Alphabetize packagesEduardo Gonzalez1-13/+13
Some images have packages sorted alphabetically and some not. Unify common style between all images. Change-Id: I906ed89c10b12886665618752f525ba71d83d991
2017-03-24Merged multiple ENV into a single layerMohammed Naser1-3/+3
There are multiple ENV calls which create multiple unnecessary layers, this patch merges them into a single layer. Change-Id: Icf40033b03a61abbcdcbf72fe8f8137d1a12d2b5
2017-03-23Merge "Switch trunk/cbs/buildlogs to use https"Jenkins1-1/+1
2017-03-22Gate fixes: disable bifrost-base, fix ubuntu base imageMohammed Naser1-0/+1
At the moment, Bifrost has caused a few failures which have blocked the gate, the latest of which is documented in the bug listed below (alongside with another one that caused another gate failure). In order to let patches flow though, we're disabling it from the gate build checks as agreed on the Kolla meeting on the 22nd of March 2017. Also, the Ubuntu base image seems to have a missing /etc/protocols which is created by the netbase package. This has been added to the base images. There are issues with subunit getting a very large log all at once which causes failures that is causing issues. We also enable logging to a local folder which will make troubleshooting image builds easier to read and avoid sending a large blob of data to subunit. Change-Id: Iee1f8b06ec1066015ea5c6a6a245723402e35a6a Related-Bug: #1674483 Related-Bug: #1673776 Closes-Bug: #1675101
2017-03-21Switch trunk/cbs/buildlogs to use httpsEmilien Macchi1-1/+1
There is a permanent redirection from http to https in buildlogs, cbs and trunk repos that might create issues when the redirection fails for some reasons. Let's use https directly. Change-Id: I15b2df335b4b9331466da2f7cb6e838823a6fd34
2017-03-13debian: install gnupg and dirmngr needed for apt-keyMarcin Juszkiewicz1-1/+1
Debian/stretch container image does not have them installed so apt-key calls fail. Partially-Implements: multiarch-and-arm64-containers Change-Id: Ia1ca5e62d815a224716074cf81e7d7519f33d6fc
2017-02-23Fix wording around supported releases in basePaul Bourke1-2/+2
Change-Id: Idb5a40f080937c74008caf2650ba82d82ab520c4
2017-02-17Merge "Re-enable grafana gpgcheck"Jenkins1-2/+1
2017-02-16Merge "debian: import key for download.ceph.com repository"Jenkins1-0/+1
2017-02-15Re-enable grafana gpgcheckJeffrey Zhang1-2/+1
grafana package is signed now. Change-Id: I5e0cfe138198b37328c7a7f56413f48999118cfa Closes-Bug: #1664272
2017-02-14Fix Kolla gateJeffrey Zhang1-1/+2
There are two issue in kolla gate now. Since source building is voting, we have to squash these two fixes into one Disable gpgcheck in grafana repo Seems there is something wrong in grafana repo gpg key. Disable gpgcheck until it is fixed Partial-Bug: #1664272 Add VENV variable in bifrost base Dockerfile * ANSIBLE_FROM_PYPI is removed in bifrost. * Only when VENV exist, ansible is installed in global rather then root user Change-Id: Ib96433e6d2a03941cace8ed15dafbb314c4551eb
2017-02-12debian: import key for download.ceph.com repositoryMarcin Juszkiewicz1-0/+1
This change fixes one warning: INFO:kolla.image.build.base:W: GPG error: http://download.ceph.com jessie InRelease: The following signatures couldn't be verified because the public key is not available: NO_PUBKEY E84AC2C0460F3994 Change-Id: I2a1109e787de9a342a7c359c90619cb277c7c2df Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
2017-02-10Merge "Clean dockerfile output on Ubuntu distro"Jenkins1-2/+1
2017-02-09Merge "Move fluentd td.repo to base for consistency"Jenkins4-4/+19
2017-02-08Move fluentd td.repo to base for consistencyPaul Bourke4-4/+19
Additional repos for centos such as elasticsearch, ceph etc. are all set up in the base image, fluentd should follow this both for consistency and to make it easier for operators to remove/override. Change-Id: If2ee20232d72ccf6b1c4be06c2fb3d1fa219e9cc
2017-02-07Merge "Revert "Update dumb-init to version 1.2.0""Jenkins1-1/+1
2017-02-07Revert "Update dumb-init to version 1.2.0"Jeffrey Zhang1-1/+1
This reverts commit 49cd429ffd6fbd3f6b67d481bdd1504219e5fd62. dumb-init v1.2.0 busts the container with unknown reason now and then. There is an upstream issue tracking this[0]. [0] https://github.com/Yelp/dumb-init/issues/136 Partial-Bug: #1662383 Change-Id: I310e78307b6577110dc867d7524b5ac98f625c8e
2017-02-05Remove include_header and include_footer in all DockerfilesJeffrey Zhang1-1/+0
include_header and include_footer parameter is already removed, remove them in all Dockerfiles. Add missing footer block. Change-Id: I90da03eb9f95a3827361d5f5ede65fde7d6be2b3
2017-01-31Merge "Revert "Removed percona from ubuntu repos""Jenkins2-2/+7
2017-01-31Merge "Update dumb-init to version 1.2.0"Jenkins1-1/+1
2017-01-31Revert "Removed percona from ubuntu repos"Sam Yaple2-2/+7
This reverts commit af7a1da8076f7a253795c2a431b3eeec4cd348d7. Co-Authored-By: Michal (inc0) Jastrzebski <inc007@gmail.com> Change-Id: I81df3bf01f618dbc7f771ee2e188eaa562ffe9db Closes-Bug: #1659981
2017-01-26Update elastic repo to httpsCuong Nguyen4-7/+7
Change elastic repo from http -> https Change-Id: Ie21ad9952355cd766b900fdbab682f44f2b8cfaa Closes-Bug: #1659479
2017-01-24Clean dockerfile output on Ubuntu distroBertrand Lallau1-2/+1
Ubuntu Dockerfile output actually contains not related RPM comments. Change-Id: I306baeaa2d4ffa1269a347e1e1b23f26caefda06