summaryrefslogtreecommitdiff
path: root/docker/base/Dockerfile.j2
AgeCommit message (Collapse)AuthorFilesLines
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
2016-12-20Removed percona from ubuntu reposSam Yaple1-7/+11
16.04 provides the percona-xtrabackup scripts in the main repos, so the specific percona repo can be removed. Unfortunately, mariadb10.0 does not build with galera built-in. So until ubuntu packages mariadb10.1, we will be dependant on the external repos for mariadb with galera built in. Labels keys so they are easily identified in the future. In Jinja2 the comments cannot go inline while generating the list. Change-Id: I5e6c2f884c8d59bbc574b71ac731d1b4db18b68c
2016-12-20Readability improvement to base imageChao Guo1-13/+33
Improve the dockerfile readability, eliminate some long lines. Change-Id: Ia8fc3478950855e1867dd30fa2fc47b8e3df22f8
2016-11-22Update Percona repo to current releaseportdirect1-1/+1
The Percona Repo was updated on the 14th November to version 0.1-4 this commit updates rpm based builds to reflect that change. Closes-Bug: #1643867 Change-Id: I5787943bb2bc11408ca8e8cdd6d1997cbc8919f1
2016-11-06remove override_install_langs option in /etc/yum.confjiangpch1-1/+2
Closes-Bug: #1637803 Change-Id: I5c22b76379b1dce1673124ac8b46b894449405a5
2016-11-03Remove Fedora supportChristian Berendt1-16/+3
Closes-bug: #1616387 Change-Id: Id97f88b9baa3d48d33ce120962450a374282d044
2016-11-02Merge "Revert "Move RDO to Newton branches""Jenkins1-4/+1
2016-11-02Revert "Move RDO to Newton branches"Steven Dake1-4/+1
Revert note: Get RDO back on master instead of the newton branch This reverts commit aeb86de6fc644a514d060b4ac869cab364266f03. Change-Id: I765ba60c3bd09fe3978570b7921a084c9b90c7d0
2016-10-19Add blocks to customize RHEL package installationAndrew Widdersheim1-0/+2
Add blocks to the base Docker image that allows the operator to override the base RHEL package installation. TrivialFix Change-Id: If570975e1f57ef9820544174dacc3f13d09bb215
2016-10-18Fix mariadb build issueMichal (inc0) Jastrzebski1-0/+1
Change-Id: I12cb9a000f2d90007c1ea55d1ca12ede28c35d6f Closes-Bug: #1634680
2016-10-16Remove ceph repo for Ubuntu installJeffrey Zhang1-2/+0
Ubuntu cloud archive provides ceph jewel now. Remove ceph official repo for the wrong dependency when installing ceph. Change-Id: I5be6b18c4250733ed9ab4f526fcdc45eb84f8342 Closes-Bug: #1633888
2016-10-07Move RDO to Newton branchesSteven Dake1-1/+4
RDO Newton is available. Lets use it and test with it this final week. TrivialFix Change-Id: I2a761366da7c2cf209adaceb73ac7fa9c9aa3cba
2016-09-22Merge "Fix permission for /var/log/kolla folder"Jenkins1-0/+3
2016-09-22Fix permission for /var/log/kolla folderJeffrey Zhang1-0/+3
Docker will change the name volume folder permission to image already set. /var/log/kolla is not created and well configured in image. This patch set creates and configures proper permission /var/log/kolla in base image. This patch set also fixed the ceph image by adding ceph user to kolla group. TrivialFix Change-Id: Ib5ef0187e90de2699b3cda31e819b4babb07e0af
2016-09-21Merge "Fix base CentOS repository keys"Jenkins1-2/+1
2016-09-20Fix base CentOS repository keysJiri Stransky1-2/+1
Fix typo in variable name ("yup" instead of "yum"), which means we now import the repo keys we intended to. Furthermore we no longer try to import EPEL key in that very spot, as it should be imported after epel-release is installed, which already happens later during the base image build. CentOS/EPEL keys in the image before this patch: ()[root@6843e7e136cf ~]# rpm -q gpg-pubkey --qf '%{summary}\n' | grep -i -E '(centos)|(epel)' gpg(CentOS-7 Key (CentOS 7 Official Signing Key) <security@centos.org>) gpg(Fedora EPEL (7) <epel@fedoraproject.org>) With this patch: ()[root@64a6ae7d0347 ~]# rpm -q gpg-pubkey --qf '%{summary}\n' | grep -i -E '(centos)|(epel)' gpg(CentOS-7 Key (CentOS 7 Official Signing Key) <security@centos.org>) gpg(CentOS Storage SIG (http://wiki.centos.org/SpecialInterestGroup/Storage) <security@centos.org>) gpg(CentOS Virtualization SIG (http://wiki.centos.org/SpecialInterestGroup/Virtualization) <security@centos.org>) gpg(Fedora EPEL (7) <epel@fedoraproject.org>) Change-Id: I5cd22a887282e5de199a809b0798a439ce1a99e7 Closes-Bug: #1625585
2016-09-19Update EPEL version in baseAndrew Widdersheim1-2/+2
Update to epel-release 7-6. Also, move from HTTPS to HTTP in the RHEL builds to match what is happening in Oracle Linux. Seems as though HTTPS does not work any longer. TrivialFix Change-Id: Icc457a333acdd5cc5b1e124d4308c4af1eb8d2cc
2016-09-13Merge "Install apt-utils in Ubuntu base image"Jenkins1-0/+1
2016-09-13Add missing apt-get clean in Ubuntu base imageChristian Berendt1-1/+3
TrivialFix Change-Id: Ibd4ba9dbe2cadb304e027b60d5b7378416719d12
2016-09-13Install apt-utils in Ubuntu base imageChristian Berendt1-0/+1
Change-Id: I5b96dc0e8debd718bb61b3bd9c1c2028af004a1c Closes-bug: #1622777
2016-09-12Added grafana containerMathias Ewald1-2/+7
Added grafana repository to base image Co-Authored-By: zhubingbing <zhubingbing10@gmail.com> Installed grafana from repository Change-Id: Ib99195ec4522f185f6fd4cebf10e305bb58f69c4 Partially-Implements: Blueprint performance-monitoring
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-12 13:24:35 +0000