summaryrefslogtreecommitdiff
path: root/docker/base/Dockerfile.j2
AgeCommit message (Collapse)AuthorFilesLines
2018-08-14Merge "base: do not set $contentdir for CentOS"Zuul1-11/+0
2018-08-10base/centos: stop treating AArch64 in special wayMarcin Juszkiewicz1-18/+5
All repositories we depend on got synced to mirrors. So we no longer need to fetch ceph-luminous or opstools from buildlogs.centos.org server. Change-Id: Ie7b54d20f98d26d3e086bbbfcda289c2677a008a
2018-08-10base: do not set $contentdir for CentOSMarcin Juszkiewicz1-11/+0
We no longer have to set $contentdir for CentOS as it is set in centos:7 images now. This code was required when Docker hub had 7.4 images while 7.5 packages were already in repositories. Change-Id: I69d1b87ffb3af1dea2f8cf93a2264df93356e9ed
2018-08-07Merge "centos: clean altarch repositories situation a bit"Zuul1-4/+4
2018-07-26add additional Remove yum cacheJon Schlueter1-3/+6
as a followup to https://review.openstack.org/#/c/505143/ "Remove yum cache" Change-Id: Ifaaead6f6efe35808ebf79ea0d4474fbb60c8994
2018-07-10centos: clean altarch repositories situation a bitMarcin Juszkiewicz1-4/+4
CentOS team synced virt/kvm-common repository for alternate archs. We can just install 'centos-release-qemu-ev' package like it is done on x86-64. Change-Id: Ie45a0b83fc4460d5dfce82efca061272db974ead
2018-07-09Update elasticsearch and kibana version to 5.xKevin Tibi1-2/+1
Change-Id: I8ed60eab2c15ae966960bcbeadb7aa25fece83a5 Implements: bp-elasticsearch-upgrade
2018-06-15dind: get image buildable for DebianMarcin Juszkiewicz1-0/+1
With use of Docker-CE from upstream. Change-Id: If1a6fe3f1654a2c06c3c3882dc56cdfc6945a17e
2018-06-06Merge "Install sensu from centos-opstools"Zuul1-1/+0
2018-06-04do not set contentdir to 'centos' on 'rhel'Thierry Vignaud1-4/+7
commit ec5daaaa634351d24706e605c2c6726be402d35b wrongly did this for rhel too Change-Id: I202ea5341f8db315b90367cbdef5c7b26567738b
2018-05-31Install sensu from centos-opstoolsMartin André1-1/+0
This should help improve stability overall, in exchange for slightly older package version. Cap all the sensu plugins to their known major version that works with the ruby interpreter shipped with the current version of rhel/centos/oraclelinux -- currently ruby 2.0. All sensu plugins use semantic versioning so we're assured they don't introduce breaking changes in the capped major version. Change-Id: Ic5ca679c40da3e466433b0e04f762d2bbffbf156 Closes-Bug: #1774123
2018-05-25base: import Linaro ERP 18.06 repo keyMarcin Juszkiewicz1-0/+1
Change-Id: I7d85c3bfd21f6f2bed631a7817507595d4bbe521
2018-05-17base: drop not needed APT keyMarcin Juszkiewicz1-1/+0
Change-Id: I94dba206614ee353cdbb6cf1d44716d4c94e55ab
2018-05-13base: set $contentdir for CentOSMarcin Juszkiewicz1-0/+9
CentOS recently started syncing alternate arch repos to mirrors. And to make it easier to play with centos-* packages idea of 'contentdir' appeared. https://lists.centos.org/pipermail/centos-devel/2018-March/016542.html Change-Id: Ieb26c0aa65ba3ec1a45a33f87f670e5ecb782f82
2018-05-10Merge "base/nova-compute: install udev/systemd to satisfy dependencies"Zuul1-0/+5
2018-05-10base: bump centos-release-qemu-ev for oraclelinuxMarcin Juszkiewicz1-1/+1
Change-Id: I0456040255bb9aa9091f1fb35e7d6960b8a36f9a
2018-05-08base/nova-compute: install udev/systemd to satisfy dependenciesMarcin Juszkiewicz1-0/+5
For Debian we use 'stretch-backports' image due to requirements of some images. That means that we also have systemd from backports. This breaks 'open-iscsi' (base) and 'python-guestfs' (nova-compute) installation. Solution is to install 'udev' and 'systemd' in proper versions. INFO:kolla.common.utils.base:Some packages could not be installed. This may mean that you have INFO:kolla.common.utils.base:requested an impossible situation or if you are using the unstable INFO:kolla.common.utils.base:distribution that some required packages have not yet been created INFO:kolla.common.utils.base:or been moved out of Incoming. INFO:kolla.common.utils.base:The following information may help to resolve the situation: INFO:kolla.common.utils.base:The following packages have unmet dependencies: INFO:kolla.common.utils.base: open-iscsi : Depends: udev but it is not going to be installed INFO:kolla.common.utils.base:E: Unable to correct problems, you have held broken packages. INFO:kolla.common.utils.nova-compute: python-guestfs : Depends: libguestfs0 (= 1:1.34.6-2) but it is not going to be installed INFO:kolla.common.utils.nova-compute:E: Unable to correct problems, you have held broken packages. Closes-bug: #1769850 Change-Id: I4865c279d665cf34fc150794c01368a1602319f0
2018-05-03Add Grafana repository for arm64Jorge Niedbalski1-0/+1
Official ARM support as part of the release process of grafana is on development [0]. For now, the closest official repositories are the ones from fg2it repository, which is also part of the developers working on the support, so we are adding it to the sources for now until the official support is done. [0] https://github.com/grafana/grafana-docker/issues/117 Bug: #1768585 Signed-off-by: Jorge Niedbalski <jorge.niedbalski@linaro.org> Change-Id: Iba004f99c0ac92cb660e405c5ac9c61dc7fa81e2
2018-04-25Remove EPEL for RDO of RHELMinho Ban1-4/+6
Since Ocata, it has been recommended to disable EPEL when using RDO because of breaking backward compatibility. https://docs.openstack.org/ocata/install-guide-rdo/environment-packages.html There seems to be no special reason to use EPEL in case of RHEL. Change-Id: Iadc351dac518c03163811aab4dfeee7ad0457687 Signed-off-by: Minho Ban <mhban@samsung.com>
2018-04-03Update base image with latest security fixesMartin André1-3/+6
This ensures freshly built kolla images include the latest security fixes for severity Important and above. This was suggested by Jon Schlueter and based on the code available at https://github.com/brianwcook/happywebserver/blob/master/Dockerfile#L27 Change-Id: Ib14f326a335d9519fb888f5486950275985a788c
2018-03-12Update ZooKeeper from 3.4.9 to 3.4.10Doug Szumski1-2/+1
3.4.10 is the current stable release of Zookeeper. sha1sum is from: http://www-eu.apache.org/dist/zookeeper/stable/ zookeeper-3.4.10.tar.gz.sha1 Change-Id: I745f3d5949be66f8463e1e1a3d02b25d2606d256 Partially-Implements: blueprint monasca-containers
2018-02-14Add socat to base imageMartin Mágr1-0/+3
We would need socat tool to perform healthchecks on the various containers. Closes-Bug: #1749227 Change-Id: Ibda77a8d041d894f5efac6578e52b11651bca97f
2018-01-21Consume RDO packaged mariadb versionSteven Dake1-7/+0
RDO packaged mariadb recieves far more testing and qualification than any other mariadb package on CentOS. Lets use that instead of a hard-pinned old version of mariadb from mariadb.org. This patch also upgrade MariaDB from 10.0 to 10.1.20 for RHEL/CentOS/Oracle Linux. Depends-On: I8374ac2219ad7880970cd789727d01af7cac1077 Depends-On: Ia2acb09e877a586243fc1acb49d8d140cf27d7b5 Co-Authored-By: Xinliang Liu <xinliang.liu@linaro.org> Change-Id: I071362fc1b8d60199a77e2fe0475d2b4c3b5341b
2018-01-19Add ceph-nfs containercaowei1-0/+1
Change-Id: I06325d4601128a0b5a2235370fa44012427c29e3 Implements: blueprint ceph-nfs-container
2017-12-14Revert "debian: import key for download.ceph.com repository"Marcin Juszkiewicz1-1/+0
We no longer use ceph from upstream as it does not support Debian 'stretch'.` This reverts commit d4017985a574b6e4eab90213e6f383ef7912b0a3. Change-Id: Ia363bf93429ea917f242c4a24d78853cf43c95ff
2017-12-14Add sensu imagesMathias Ewald1-0/+1
Add sensu yum repository to base image Create images for sensu-server, sensu-api and sensu-client processes Install a basic set of handler plugins into server image Install a basic set of sensu plugins into client image Change-Id: I0b88133080c58070c24ed90059315366b64034c6
2017-12-10Merge "Bump to ceph luminous"Zuul1-2/+2
2017-12-06Merge "base: use install_packages macro instead of calling APT"Zuul1-4/+8
2017-12-05Bump to ceph luminousJeffrey Zhang1-2/+2
Add ceph-mgr images Change-Id: I875f84012a92d4f8b9dcb212d917cf61167270b8 Implements: blueprint ceph-luminous
2017-11-27Remove yum-axelget from base imageAlfredo Moralejo1-4/+2
This patch partially reverts https://review.openstack.org/#/c/521716/. Package yum-axelget is not in CentOS or RDO repositories. Note that installing packages from EPEL repos is not recommended when deploying RDO. Closes-Bug: #1734690 Change-Id: Id34e667673d0b4e20fe3fdd2a880a1769ec2a6c3
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