aboutsummaryrefslogtreecommitdiff
path: root/docker/base/Dockerfile.j2
AgeCommit message (Collapse)AuthorFilesLines
2017-11-27base: use install_packages macro instead of calling APTMarcin Juszkiewicz1-4/+8
Change-Id: I9176a6a755f527010234b1eee3342dbc649a1b34 Depends-on: Icfff55d92fa5c865f09db5112da28bf452a5a221
2017-11-21Use 3 hours timeout for gate jobs and install yum-axelgetJeffrey Zhang1-2/+4
We have much more images and need more time to build jobs. Install yum-axelget to make download more faster. Change-Id: I8af9aef98864214a16eb0fad2142bd1679afe94e
2017-11-02Cleanup APT lists after installing packagesChristian Berendt1-2/+4
/var/lib/apt/lists/ can take several MBs so get rid of them after packages are installed. Change-Id: Icfff55d92fa5c865f09db5112da28bf452a5a221
2017-09-18Fix dind and zun images and oraclelinux buildEduardo Gonzalez1-2/+1
- dind need setuptools to install docker through pip in binary install - oraclelinux fails to install due opstools repo and openstack mitaka repos missing. - zun removed moved nova out of etc because is not used. https://github.com/openstack/zun/commit/6dc286616727fde6e4d22b415bd961ebd8854920 Change-Id: Ic4eb0f2e97a108be3c854c95eede27b5cd411b5c Closes-Bug: #1716952
2017-08-30Fix the order of the RHEL 7 server optional repositoryheetae82.ahn1-1/+1
In order to install yum-plugin-priorities, it needs the repository rhel-7-server-optional-rpms. So this patch fixes the order. Change-Id: Ie3330ac964740fae35bf86ffc86ef0ee20b559e1 Signed-off-by: Taeha Kim <kthguru@gmail.com> Signed-off-by: heetae82.ahn <heetae82.ahn@samsung.com>
2017-08-23base: add Debian 'stretch' repo for opendaylightMarcin Juszkiewicz1-0/+1
OpenDayLight project does not provide package for Debian 'stretch' currently so I took care of it by rebuilding package from Ubuntu PPA. Change-Id: I60daf60ef159bc0f230a2de96fca45a6cb4c37a6 Depends-on: I6b205a2bb61207d1549222ba5501536b2743df77
2017-08-23base: add support for fetching APT keys from filesMarcin Juszkiewicz1-2/+11
For RPM distros we use GPG keys as URLs because rpm can handle it. For Debian based distros we fetch GPG keys from ubuntu keyserver. But it does not work with OBS repositories where key is provided as file in repo. This change adds support for fetching GPG keys for APT use. Change-Id: I6b205a2bb61207d1549222ba5501536b2743df77
2017-08-03Move ODL repo enablement into base imageThierry Vignaud1-0/+1
This makes it consistent with the rest of the images and lets kolla users disable external repo in a clean fashion. Co-Authored-By: Martin André <m.andre@redhat.com> Change-Id: If6d03d2168a14181b7a32d7810b8fe4b1d798585
2017-07-17Merge "Point ubuntu ODL repos to PPA's"Jenkins1-0/+2
2017-06-28Enable RHN channels needed by CephGiulio Fidente1-1/+4
A few images install Ceph packages but only the centos image was enabling the Ceph repo. Change-Id: I4ccd2400959bb143380fa097d350145532d5afad
2017-06-28Point ubuntu ODL repos to PPA'sEduardo Gonzalez1-0/+2
PPA repos are maintained by odl-team rather than current repos under an individual namespace. Change-Id: I282f81e802df5ec2a0690fff4a37da07275e2d42
2017-06-15Permit changing yum configuration in the base imageMartin André1-0/+4
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-05-30Sensu imagesMartin Mágr1-0/+6
This patch adds possibility to have container with sensu-client service. Implements: blueprint container-healthchecks Change-Id: I1c659ce38299d5497a80fa96dd2dd39bd40176c3
2017-05-23Merge "Add qdrouterd container"Jenkins1-0/+2
2017-05-18Add qdrouterd containerAndrew Smith1-0/+2
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é1-5/+328
This reverts commit fd6d89c4953dace9b324c9de8303ec88a21a9710. Change-Id: I93252e459b97b7885432822ff86de6b261c420b2 Related-Bug: #1691413
2017-05-13Clean up base DockerfileMichal (inc0) Jastrzebski1-328/+5
I think this simple change will make it much more readable Change-Id: I369aee3a19d17c134db1d13b94b8c45a44733149
2017-05-11Move shebang customization into jinja2 blockMartin André1-2/+4
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 Juszkiewicz1-24/+79
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-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-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 Juszkiewicz1-1/+1
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-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-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"Jenkins1-4/+8
2017-02-08Move fluentd td.repo to base for consistencyPaul Bourke1-4/+8
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""Jenkins1-2/+4
2017-01-31Revert "Removed percona from ubuntu repos"Sam Yaple1-2/+4
This reverts commit af7a1da8076f7a253795c2a431b3eeec4cd348d7. Co-Authored-By: Michal (inc0) Jastrzebski <inc007@gmail.com> Change-Id: I81df3bf01f618dbc7f771ee2e188eaa562ffe9db Closes-Bug: #1659981
2017-01-24Clean dockerfile output on Ubuntu distroBertrand Lallau1-2/+1
Ubuntu Dockerfile output actually contains not related RPM comments. Change-Id: I306baeaa2d4ffa1269a347e1e1b23f26caefda06
2017-01-24Update dumb-init to version 1.2.0Bertrand Lallau1-1/+1
Change-Id: I896140375530f6c3a0ed8adc8a9632d36a8d359d
2017-01-20Add block for dumb-init installationEdmund Rhudy1-3/+7
This moves the dumb-init installation to its own RUN command in a separate block so that it can be overridden for Internet-disconnected builds. Change-Id: Ice1d6b086db85d2c2b364518b26eb819e92e1d4f Closes-Bug: #1657583
2017-01-18Merge "Add blocks for Ubuntu apt setup and package installation"Jenkins1-7/+17
2017-01-17Add blocks for Ubuntu apt setup and package installationEdmund Rhudy1-7/+17
This adds additional blocks in the base image dockerfile to enable overriding additional sections, as well as doing so in a more fine-grained manner. The main use case here is being able to do Internet-isolated builds of Ubuntu-based Docker images. Change-Id: I9842895a898f6798becc6177aabdf8deffead611 Closes-Bug: #1656069
2017-01-17use static uid/gid in imagesSam Yaple1-1/+9
This centralizes all user and group creation into a single source. This will fix any current and furture uid/gid mismatches (such as with nova-libvirt). In the process, we also unify users between the distros in a standard way. The users in the following containers change from thier defaults: Ubuntu: _chrony user is now chrony Ubuntu: memcache user is now memcached All: qemu user is used for ownership and socket permissions All uid and gid numbers are customizable via kolla-build.conf Co-Authored-By: Kris Lindgren <klindgren@godaddy.com> Change-Id: I120f26ab0683dc87d69727c3df8d4707e52a4543 Partially-Implements: blueprint static-uid-gid
2017-01-17Install epel-release-latest rather than certain versionJeffrey Zhang1-2/+2
Install epel-release-latest from fedoraproject.org Change-Id: Ifb667aaf5184346be70647d9c7574833f526a3cf Closes-Bug: #1656733
2017-01-02Enable zookeeper for CentOS/OracleLinuxSteven Dake1-1/+2
Change-Id: I5e0e3afc18cba63ea0c9b7d8a9ae32ae8a774ba1 Partially-Implements: blueprint monasca-containers
2016-12-28Merge "Removed percona from ubuntu repos"Jenkins1-7/+11