aboutsummaryrefslogtreecommitdiff
path: root/docker/base/Dockerfile.j2
AgeCommit message (Collapse)AuthorFilesLines
2019-10-17get 'apt_*' options of kolla-build.conf working againMarcin Juszkiewicz1-0/+2
We broke 'apt_sources_list' and 'apt_preferences' options quite a while ago. Turned out that fix is quite simple. This change adds empty sources.list and apt-preferences files which are always added into images. If kolla-build.conf will use any of APT related options then those files will be replaced with provided ones. Change-Id: I7bbdcbd5c60f654a484a872209e0537e3950346c Closes-bug: #1706549
2019-10-12Custom CA certificates installation mechanismViktor Michalek1-1/+4
Change-Id: I0fd596d93a0e575a391250d4bed261ad370a3664
2019-10-03Merge "Use C.UTF-8 locale"Zuul1-0/+6
2019-10-01debian: switch to Train binary packagesMarcin Juszkiewicz1-1/+1
Repository may not contain all packages yet. Change-Id: I88e1c8c1ce78fc138fa2541b15a7620fa7300043
2019-09-27Merge "ppc64le: Ensure that rabbitmq-server.repo exists before trying sed"Zuul1-1/+5
2019-09-26Use C.UTF-8 localeRadosław Piliszek1-0/+6
This ought to fix problems with Unicode, including the recent vmtp issue with tabulate 0.8.4 failing due to non-Unicode locale (Ubuntu Bionic 18.04 Python 3.6). Change-Id: I8b55a6a260cab14c2292cac02a1a07729223c281 Related-bug: #1845306 Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
2019-09-24ppc64le: Ensure that rabbitmq-server.repo exists before trying sedMike Turek1-1/+5
TripleO container builds are currently failing for ppc64le as the rabbitmq repo file doesn't exist, causing sed to fail. [0] The file not existing is expected for TripleO image builds as these repos are overriden in this case. [1] This patch tests that the file exists to prevent this failure. [0] https://centos.logs.rdoproject.org/tripleo-upstream-containers-build-master-ppc64le/1540/logs/logs/build.log [1] http://eavesdrop.openstack.org/irclogs/%23openstack-kolla/%23openstack-kolla.2019-09-23.log.html#t2019-09-23T16:42:29 Change-Id: I7bf6d064ad8deb94a8fe53f4f4735f7b13ff27b1 Co-Authored-By: Mark Goddard <mark@stackhpc.com>
2019-09-24Fluentd: td-agent repository for DebianViktor Michalek1-0/+1
Change-Id: I0f05183889971dcc014663a849d3fc1d87a19e8e
2019-09-24Add Debian Buster Stein backports APT repositoryViktor Michalek1-1/+2
Change-Id: Ie140cf0d6308a5ee3c09f06ddfcf63be2e1cec64
2019-09-18Merge "Remove support for OracleLinux"Zuul1-34/+0
2019-09-18Remove support for OracleLinuxMark Goddard1-34/+0
We have agreed to remove support for Oracle Linux. http://lists.openstack.org/pipermail/openstack-discuss/2019-June/006896.html Change-Id: I961dfba1aeef2c509ecdaf376dfe6928926ffb39 Depends-On: https://review.opendev.org/682858
2019-09-18base: enable rabbitmq and elasticsearch repos for ppc64leMarcin Juszkiewicz1-0/+16
We use the fact that 'rabbitmq-server' package is 'noarch' and reuse x86-64 repository for ppc64le architecture. Package installs and runs. Change-Id: I7a8b22dacc0626561ea261fc198d5ce4912902e1
2019-09-17CI: CentOS - override mirrors ASAP + crmsh mirror overrideRadosław Piliszek1-1/+9
This makes mirrored repos used as soon as they are installed in the image, instead of hitting upstreams. This patch also adds crmsh override. Usable only after infra change merges. Depends-on: https://review.opendev.org/682576 Change-Id: Ic7494eff4c740b6e528da4508dc88a64e697bc04 Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
2019-09-16Merge "Drop Percona XtraBackup in favour of MariaDB Backup"Zuul1-5/+0
2019-09-14Merge "base/deb: bump 'system' users limit beyond Kolla ones"Zuul1-1/+4
2019-09-12Drop Percona XtraBackup in favour of MariaDB BackupMarcin Juszkiewicz1-5/+0
XtraBackup started failing to install on Ubuntu and does not support MariaDB 10.3 version. Related-Bug: #1843043 Change-Id: I9cf62c8e03a02574d85e5349df1d23a51d4c99be
2019-09-09base/deb: bump 'system' users limit beyond Kolla onesMarcin Juszkiewicz1-1/+4
Haproxy complains that user 'haproxy' already exists during installation and is not 'system user'. So let bump range for 'system' users to make it happier. Our images do not have normal users so it should not affect. Change-Id: Ia073774c8053111652847a39d80665fd9d3e5dcf
2019-09-09Merge "base: drop not needed Linaro OBS key"Zuul1-1/+0
2019-09-05base: drop not needed Linaro OBS keyMarcin Juszkiewicz1-1/+0
Change-Id: Ibcab61edbf44c608127c40903798848be0cf17e6
2019-08-31Move to MariaDB upstream repo and new version (10.3) on UbuntuMichal Nasiadka1-1/+3
MariaDB in Ubuntu packages is backlevel (10.1). Devstack gates are tested on MySQL 5.7 which is not compatible with MariaDB 10.1. Neutron recently introduced a db migration that breaks on MariaDB 10.1, but works on MariaDB 10.3 [0]. Bumping up version to 10.3 on Ubuntu to match CentOS (RDO) version. [0]: https://review.opendev.org/#/c/677221/ Closes-Bug: #1841907 Change-Id: I16e4c40208912691e3015bfe2065ea0ce2358edb
2019-08-05Merge "Add HAcluster containers"Zuul1-0/+1
2019-07-18Add HAcluster containersGaëtan Trellu1-0/+1
Theses images contains High Availability solution such as Corosync, Pacemaker, Pacemaker Remote and PCS. Change-Id: I86fd145d2998f68b08a16082414b86904971549a Implements: blueprint pacemaker-container
2019-07-16base: enable elasticsearch and rabbitmq repos for centos/aarch64Marcin Juszkiewicz1-1/+5
Change-Id: Idd577e18436a2d0215b88a4cca745f8746504921
2019-06-26Move back to CentOS StorageSIG repos for Ceph and GaneshaGiulio Fidente1-2/+4
Recently a new repo was created in CentOS to distribute Ganesha, and the repo made a dependency of the Ceph Nautilus repo package [1] When centos-release-ceph-nautilus 1.2-1 will go out, it should not be necessary to disable the CentOS Ceph repos pulled in by dependency of the RDO repositories, as done in [2] 1. https://github.com/CentOS-Storage-SIG/centos-release-ceph/commit/f1a17c9d145cabfa1dfd3102fe7e2fc584f6a907 2. https://review.opendev.org/#/c/651601/ Change-Id: I6bf0cbfaffc22147c5bec03b5897719de53366ed
2019-06-24Merge "Add a variable to configure repos disabled in base CentOS image"Zuul1-6/+11
2019-06-18Merge "Remove crane image"Zuul1-1/+0
2019-06-18Add a variable to configure repos disabled in base CentOS imageRadosław Piliszek1-6/+11
[1] disabled CentOS Ceph Nautilus repo for Stein. It turned out to be a problem for TripleO ([2]) which does not use upstream Ceph repo and actually relies on CentOS Ceph Nautilus repo. We did not leave the option to override our customization. This patch adds a customizable variable to base CentOS image: centos_yum_repos_to_disable [1] https://review.opendev.org/651601 [2] https://review.opendev.org/664244 Change-Id: I867ca75cafe853b206beae2f81dfb79b62d05557 Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
2019-06-17Merge "grafana/aarch64: use package from upstream repositories"Zuul1-0/+5
2019-06-08Fix issues with Percona in Zuul and clean up a little bitRadosław Piliszek1-6/+1
Percona site has connectivity issues from OVH hosts (of Zuul). This patch makes it so that: - the internal repo is actually used - RPM GPG keys are downloaded from the actually used repo - Ubuntu mimics the RHEL behavior (i.e. the Percona repo is enabled only in the xtrabackup image) extra benefit: no need for APT preferences for Percona repo to spare MariaDB deps Change-Id: Id27831f6b404762f9e44fd6bd1c4702bf06b05f8 Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
2019-06-07grafana/aarch64: use package from upstream repositoriesMarcin Juszkiewicz1-0/+5
We were installing 5.2.4 version instead of just latest one like it is done on x86-64. Change-Id: If8434c6c05e415ac8d601260d02b25facbdef1f5
2019-06-07Remove crane imageMark Goddard1-1/+0
This image was deprecated in the Stein cycle. Change-Id: I249b78cd263c97c4a9223523c77f8c325f3e649a
2019-06-06Debian/Ubuntu: move to Python 3 for source imagesMarcin Juszkiewicz1-12/+18
Commit 43b74ccc157c0b50138c3785ed91dab504895571 enabled use of Python 3 based packages but not switched to use Python 3. Some of images still contain Python 2. There are two reasons: - Ceph (ceph-common depends on Py2) - python3-ldappool on Ubuntu 18.04 In Ceph situation Py3 packages were added. For second one we can not do anything - Py2 dependency got dropped in Ubuntu 18.10 version. Removed neutron-server-plugin-networking-infoblox due to being not maintained. Once https://review.opendev.org/#/c/657578/ get merged someone may revert that part. Implements: blueprint debian-ubuntu-python3 Depends-on: Ie2a1077f7def0743f1403341985e2109aa490026 Change-Id: Ibfe0c2b8be98db56c61f74fb0247488ab3749ef4
2019-05-31Ceph: Update to Nautilus on CentOS and OracleLinuxMark Goddard1-4/+5
The CentOS Stein OpenStack distribution depends on the Ceph Nautilus release, while Kolla currently deploys Luminous on CentOS. This change switches CentOS and OracleLinux builds to use Ceph Nautilus. Support for auth UID has been removed in the Nautilus release [1][2], so we have removed the --set-uid argument from calls to ceph-authtool. Also ceph-osd bootstrap mode fails when no mon config is provided, so we added --no-mon-config (mon config is injected later after bootstrap). Due to ceph-nfs build issues (ceph upstream nfs-ganesha rpms relied on older version of userspace-rcu, than CentOS Storage SIG packages) we need to move to ceph upstream rpm repos. [1] https://github.com/ceph/ceph/commit/d6def8ba1126209f8dcb40e296977dc2b09a376e [2] http://docs.ceph.com/docs/master/releases/nautilus/ Co-Authored-By: Michal Nasiadka <michal.nasiadka@nokia.com> Change-Id: I000398f587c5f4d6cc8995e34e162eebc77bc3e3 Implements: blueprint centos-ceph-nautilus
2019-05-28Merge "Install fluentd gem on debian/ubuntu for non x86_64"Zuul1-1/+3
2019-05-01Drop systemd support from PAMCédric Jeanneret1-0/+4
The line being removed is the cause of audit.log spam with a SELinux enforcing (and permissive) system. They are due to the fact we're calling "sudo" from within some containers, and PAM wants to connect to the host "dbus" socket (mounted in /run). This action is obviously denied by SELinux. The "-" prefix makes this module optional anyway, but apparently PAM does see it and tries to use it. Dropping this module has no consequences other than preventing log spamming. Change-Id: I3e0e86026f5a4a78473bed824cd1682d3a020cd5 Co-Authored-By: Michele Baldessari <mbaldess@redhat.com> Resolves-Bug: #1819461
2019-04-13Merge "Add config option use_dumb_init to add it to container images"Zuul1-2/+4
2019-04-10Install "procps(-ng)" in the base imageCédric Jeanneret1-0/+3
Providing tools like "ps", "pgrep" and related is interesting since it helps debugging a container in some cases. It is also useful for healthchecks in case we want to fetch running service PID and use it in another command, like "lsof". Change-Id: I91b1c407caa6b03ae522e649592300f9eddfc07e
2019-04-03Add config option use_dumb_init to add it to container imagesRabi Mishra1-2/+4
Usage of dumb-init can also be disabled from cli with `--nouse-dumb-init` when building images. Also moves ENTRYPOINT outside of dumb_init_installation block. Change-Id: Id32d54fc9913b83cf121ede5a5e265e0772062ae Related-Bug: #1821970
2019-03-28Install fluentd gem on debian/ubuntu for non x86_64Pedro Alvarez1-1/+3
The package used to install fluentd on debian/ubuntu is not available for architectures other than x86_64. For those cases install fluentd as a gem until the package 'td-agent' is available for more architectures. Change-Id: Ic1b25b37d06b429a112f1418a79d385d505bb1e9
2019-03-21cleanup in base for yum install entriesJon Schlueter1-10/+4
- introduce install_packages(..., chain=True) to allow chaining on onto existing RUN commands - introduce install_packages(..., clean) which defaults correctly but allows you to override if you want to avoid doing extra package manager cleanup - refactored several calls in base to make use of these new features In general this allows for macros.install_packages to be chained after other calls for example RUN foo && {{ macros.install_packages(..., chain=True) }} Change-Id: I4b2fe8e13ee3c0fffe77a1179a7af5b534496996
2019-03-21Fixup whitespace issue in chainingJon Schlueter1-2/+2
base_rhel_package_installation block had whitespace isses depending on which branch of the if statement you had. this resulted in a blank line in the continued "\ \n &&" rendered Dockerfile Change-Id: I634f1bc01806e2606d611b3697e84b43278c4a9b
2019-03-21refactor to pull out rpm_security_update macroJon Schlueter1-11/+4
- pulled out the repeated code from 3 paths in base and moved it into docker/macros - created macros.rpm_security_update - made sure the new macro could be customized for cleanup caches - update macro to use distro_package_manager Change-Id: Ic79ff42d913e1cbb68be66743e4f79f0bcff47f5
2019-03-21Merge "Introduce clean_package_cache"Zuul1-6/+6
2019-03-20install ncurses explicitly for tput for rpm distroJon Schlueter1-0/+2
tput is used in PS1 env, but nothing explicitly makes sure that it is installed. Red Hat's ubi8 base image only contains ncurses-base and ncurses-libs but not ncurses rpm which provides the tput cli Change-Id: I4f6b101195d245e14f6600b1edd9caafd25dcaac
2019-03-17Introduce clean_package_cacheEmilien Macchi1-6/+6
Default to true (to maintain backward compatibility), this parameter will allow to disable the Package cache cleaning when building the Kolla images. In TripleO, we are investigating how we can accelerate the builds by not cleaning the Yum cache and this patch will help us to do so. Also included same for deb package_install method. Co-Authored-By: Jon Schlueter <jschluet@redhat.com> Change-Id: I0adc85302dfe0411d362c899f3e0d6a0019680d4
2019-03-15Merge "Move to Debian 'buster'"Zuul1-4/+0
2019-03-15Fix lower-constraints and kolla CI jobsMark Goddard1-3/+2
Multiple fixes to fix multiple problems. 1. Bump setuptools requirement to 21.0.0 The 16.0.0 requirement breaks the lower-constraints job on Ubuntu bionic. We see the following error: AttributeError: module 'importlib._bootstrap' has no attribute 'SourceFileLoader' 2. ubuntu-binary horizon image needs to use python3 for django manage.py 3. ubuntu-binary nova-placement-api image needs to use python3 for apache mod wsgi. 4. nova-libvirt needs exact qemu dependencies due to packaging change 5. OracleLinux repos definition was changed in official image. 6. Fetch InfluxDB gpg key for Ubuntu base image from influx server. Change-Id: Ic797d41f53a5f146d112619f1683cbfbf3a85dc2
2019-03-14Move to Debian 'buster'Marcin Juszkiewicz1-4/+0
Buster is at freeze phase so safe to update and use. Will give us Python 3 based OpenStack packages (usually release delayed). Change-Id: I48c2d252a834716f1bcf10b18f2d32fe541e8137
2019-03-12Add distro_package_manager configurationAlex Schultz1-1/+5
Add configuration to allow the switch between dnf/yum or provide an alternative package manager. Change-Id: I913769fcf5875a12b4561958cf7c90b74cd116ea
2019-03-12Add python3 packages for RHEL systemsAlex Schultz1-1/+11
RDO is currently working on python3 support for the next version of CentOS/RHEL based systems. This package uses the distro_python3 flag that was added as part of I4028991bad92c0e8e21066cc4173c06ce5eba393 to use the python3 specific package names. This change only adds python3 package names for RHEL systems. Conflicts-With: https://review.openstack.org/#/c/636457/ Change-Id: Iad6b70b433a0dd1b0f8ae6790fd280594517661a Related-Blueprint: python3-support