summaryrefslogtreecommitdiff
path: root/docker/base
AgeCommit message (Collapse)AuthorFilesLines
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-28base: use new Linaro repoMarcin Juszkiewicz1-2/+3
During Linaro Connect we decided to create separate repository for Kolla project requirements. And only for those. Repository contains: - libvirt 3.6.0 - qemu 2.10-rc - dpdk 17.05.2 - openvswitch 2.8.0 (with dpdk support) Old repository is still available but just for backward compatibility. Change-Id: I40f6b5e58c3c30f2b01b1f1cd5f275cd96a198a3
2017-09-20base: add Linaro repository for Debian with some backportsMarcin Juszkiewicz1-0/+3
For AArch64 we need libvirt newer than 3.0.0 present in Stretch. So we backported 3.6.0 (has all changes we need). Also backport of qemu 2.10-rc is present. All packages are built for aarch64 and x86_64 architectures. Change-Id: I36ce3738022c437cb3471c1af7ff587b84f96425
2017-09-20Merge "Enable xtrace on start scripts"Jenkins1-0/+1
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 Juszkiewicz2-1/+2
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-21base: enable 'opstools' repo on AArch64/CentOSMarcin Juszkiewicz1-0/+6
To build 'fluentd' image we need to have 'opstools' repo enabled. On x86-64 it is enabled by installing proper centos-release-opstools package but this option is not available (yet) for aarch64. Change-Id: I4b49270a2e0781431e22dc411774e4c6440045d9
2017-08-16Enable xtrace on start scriptsPaul Bourke1-0/+1
This helps operators more accurately see the start up sequence of containers, especially in the case where they fail and we want to see the last command executed. Change-Id: I8a5765f09d52bb11d5af5aa8886746c87757ea5f
2017-08-03Move ODL repo enablement into base imageThierry Vignaud3-0/+9
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 "Only copy symlinks when merge and preserve_properties are set"Jenkins1-1/+1
2017-07-17Merge "Point ubuntu ODL repos to PPA's"Jenkins2-0/+5
2017-07-17Only copy symlinks when merge and preserve_properties are setMartin André1-1/+1
The kolla-kubernetes config files live in a ..data directory in the config volume and are symlinked with relative path at the root of the config volume. This naturally breaks with the link copy feature introduce in I92a404b8d301937dc1847d42576e30db43951990. This commit restores the original behavior to copy the target of the link unless both 'merge' and 'preserve_properties' options are set, in which case the link itself is copied. Change-Id: I5d768687208205fb50ef5ab93675f47e98ea6351
2017-07-06Make set_configs.py work with symlinksMartin André1-4/+8
Closes-Bug: #1702305 Change-Id: I92a404b8d301937dc1847d42576e30db43951990
2017-07-04Merge "Improve logging of set_configs.py"Jenkins1-8/+9
2017-07-03Improve logging of set_configs.pyMartin André1-8/+9
Remove duplicate logging for file copying, and clarify some log messages. Change-Id: I4dfaffa62f79a32a7fd6060b92ccb119f657f854
2017-07-02Fix argument to handle_permissionsChulmin Kang1-2/+3
Fix the format of argument passed to handle_permissions function, so that handle_permissions can handle permissions and ownerships of config_files. Change-Id: Ic07975a16973df22cdaa6685fc326620812f8f65 Closes-Bug: #1701876
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 Gonzalez2-0/+5
PPA repos are maintained by odl-team rather than current repos under an individual namespace. Change-Id: I282f81e802df5ec2a0690fff4a37da07275e2d42
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