aboutsummaryrefslogtreecommitdiff
path: root/docker/base/Dockerfile.j2
AgeCommit message (Collapse)AuthorFilesLines
2020-05-17base/centos: take care of whitespacesMarcin Juszkiewicz1-12/+9
Let's get rid of this warning: Change-Id: I121e2ecb30ec6e8d1b6d88d9b921894438c3e094 INFO:kolla.common.utils.base:ESC[91m[WARNING]: Empty continuation line found in: INFO:kolla.common.utils.base: RUN dnf -y install centos-release-opstools epel-release dnf-plugins-core && dnf config-manager --enable PowerTools && dnf config-manager --disable centos-ceph-nautilus && dnf config-manager --disable centos-nfs-ganesha28 && dnf config-manager --disable influxdb && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools && dnf -y distro-sync --security --sec-severity=Important --sec-severity=Critical INFO:kolla.common.utils.base:[WARNING]: Empty continuation lines will become errors in a future release. INFO:kolla.common.utils.base:ESC[0m INFO:kolla.common.utils.base:Step 1/39 : FROM centos:8
2020-05-17CentOS: disable more reposMarcin Juszkiewicz1-0/+2
'messaging-rabbitmq' and 'opstools' are enabled by RDO delorean-deps.repo file 'influxdb' was also enabled Depends-On: https://review.opendev.org/728687 Change-Id: Ibb0a7edc9e5632c1b89a7d52601f55a223b49dfb
2020-04-29Debian: use Ussuri binary packagesMarcin Juszkiewicz1-1/+1
There is a repo with binary packages for Ussuri. Let us use them instead of Train ones. amd64 only Change-Id: I071eebc4f60094d881a68e201e8c3bb6e6742ff5
2020-04-16Merge "CentOS 8: Switch last mentions of yum to dnf"Zuul1-0/+2
2020-04-15CentOS 8: Switch last mentions of yum to dnfMark Goddard1-0/+2
Change-Id: I31e9742793cfb1abff9749083c9ce86000dae1af Partially-Implements: blueprint centos-rhel-8
2020-04-15CentOS 8: enable elasticsearch and kibana imagesMark Goddard1-5/+2
This is a follow up to I8b52b2630a72393bf4b9c7095fc67db6c36c27fa, which upgraded elasticsearch and kibana to 6.x. It did not enable the repositories or images for CentOS 8 however. This change enables elasticsearch and kibana images for CentOS 8. Change-Id: I7b375e493380c4e3d6b8c7b6f5ebc57c1b73043f Related: blueprint elasticsearch-kibana-version-upgrade
2020-04-15Remove support for CentOS 7Marcin Juszkiewicz1-134/+44
With the move to RHEL/CentOS 8 we no longer have Python 2 in our images so there is no need for checking which Python version (2.x or 3.x) is used inside of containers. We also no longer have to support yum as a value for distro_package_manager. Partially-Implements: blueprint centos-rhel-8 Change-Id: Ie45cf3465fedddbde7856961527421883ba3d5c9
2020-04-08base/centos: influxdb repo is only on x86-64Marcin Juszkiewicz1-1/+8
Change-Id: I98147939ccfeeb7b3e86b5e33c427372663ecf9b
2020-04-06Upgrade RabbitMQ to 3.8Dincer Celik1-2/+18
Upgrade and pin RabbitMQ to 3.8. Upgrade Erlang to 22 to meet requirements: https://www.rabbitmq.com/which-erlang.html Start using bintray repository provided by RabbitMQ. Linaro builds will be used for aarch64. Implements: blueprint rabbitmq-version-upgrade Closes-Bug: #1848452 Change-Id: I3d775fd832f2603181da89009cebc1370a61a023
2020-04-03add dpdk_telemetry and logparser, use centos-release-opstools for C8Piotr Rabiega1-2/+2
Adds collectd-dpdk_telemetry and collectd-logparser packages to collectd RHEL-based image. dpdk_telemetry plugin collects DPDK ethernet device metrics via dpdk_telemetry library. Logparser is plugin for filtering and parsing log messages. Change-Id: I0c7c94e9fae9d11660f938b8d7d6be0f270c972f
2020-03-13kibana, nova-libvirt: handle it properly for non-x86Marcin Juszkiewicz1-1/+2
Upstream kibana package contains NodeJS x86-64 binaries so can not be used directly on non-x86 architectures. I took upstream packages, removed NodeJS binary from it and added 'nodejs' dependency. Package is present in my Linaro OBS repository where I keep other packages needed for aarch64 kolla run. Via APT pinning I mark them as not wanted so they are not used on any architecture with two exceptions: 1. libvirt - we need fixed version to be able to use ThunderX servers 2. kibana - to be able to run it at all For x86-64 upstream kibana package is used. Closes-bug: #1867365 Change-Id: I456402849022100bde1fffdfbf6292b35690f0f2
2020-03-03Use StorageSIG repos for Ceph in CentOS8Alfredo Moralejo1-14/+3
Storage SIG has built Ceph Nautilus and Ganesha for CentOS8 in CentOS Build System. Let's switch to use them in kolla. Change-Id: Id37dca84c4eb918aaf2d3c036ef5387fe75988dd
2020-03-01Add block labels to all DockerfilesChristian Berendt1-0/+2
Change-Id: I9692dda817ef134d647247431565e1b58cf9da41
2020-02-26Actually disable EPEL, and epel-modularMark Goddard1-1/+1
The disable_extra_repos macro accepts a list as its only argument. We were calling it like this to disable EPEL: disable_extra_repos('epel') The macro interpreted this as a request to disable three repos, e, p, l. Thanks Python! Type validation to be improved separately. Additionally, on CentOS 8 the EPEL repository was not included in the repository mapping file, repos.yaml. There is also another EPEL repository on CentOS 8, epel-modular, which is enabled by default after installing epel-release. This change adds mappings for epel and epel-modular repos to repos.yaml, and fixes the disabling of epel in the base image, as well as disabling epel-modular. There are some cases where EPEL is still used (it seemed a bit too easy...), and the repository has been enabled for these images: * bifrost-base (nginx) * ironic-conductor (C7 only, shellinabox) * freezer-base (C7 only, trickle) * gnocchi-base (C8 binary only, python3-boto3) * mariadb (pv) * mongodb (C7 only, mongodb) * nova-spicehtml5proxy (C7 only, spice-html5) * telegraf (C7 only, python2-pip) A few other things were changed: * ironic-conductor does not require the ceph repo * python3-pika is no longer installed in the openstack-base image Related: blueprint remove-epel Change-Id: I3761825239dfc462072383cde6276c4fb3e1bf12
2020-02-04aarch64: enable influxdb and telegraf for Debian/UbuntuMarcin Juszkiewicz1-0/+1
Turns out that upstream provides repos also for aarch64. CentOS one is not usable due to wrong arch name used (arm64 instead of aarch64). Change-Id: I1b4ef1fae0914d6826af5456cc9ea53bb26972ee
2020-01-31Merge "CentOS 8: Use upstream Ceph/master"Zuul1-0/+13
2020-01-30Merge "CentOS 8: base image fixes for RabbitMQ, fluentd & InfluxDB"Zuul1-6/+3
2020-01-30CentOS 8: Use upstream Ceph/masterMichal Nasiadka1-0/+13
The only Ceph version that will support CentOS 8 is Octopus. It will be released end of March 2020 - so for now let's use master. Change-Id: I5955acb41e7346802d76f4f2b244cbf5c36f5bf2 Partially-Implements: blueprint centos-rhel-8
2020-01-29Merge "CentOS 8: base and openstack-base images"Zuul1-30/+110
2020-01-29CentOS 8: base image fixes for RabbitMQ, fluentd & InfluxDBMark Goddard1-6/+3
- Fix td-agent repo URL for fluentd. $releasever and $basearch variables were escaped in the repo URL. - Disable repo_gpgcheck for RabbitMQ. The rabbitmq-server 3.7 packages on packagecloud are not signed, which is why we have gpgcheck=0 for that repo. Previously repo_gpgcheck was set to 1, but this breaks DNF which does not seem to accept keys imported by rpm --import for signing a repo (as opposed to packages). This causes it to prompt during package install, which does not work without a terminal in the build container. This should be temporary as we will upgrade RabbitMQ to 3.8 soon. - Add InfluxDB repo back to list of repos to disable. Change-Id: Ibbb720390ff17e11249a5aa77163c15c0971209a Partially-Implements: blueprint centos-rhel-8
2020-01-21Merge "centos: disable EPEL by default"Zuul1-0/+1
2020-01-14Merge "base: use install_packages() macro to install packages"Zuul1-6/+2
2020-01-13Merge "base: drop commented part about site-packages in Ubuntu"Zuul1-14/+0
2020-01-13Merge "CI: use Debian/Ubuntu mirrors in base image"Zuul1-0/+2
2020-01-10base: drop commented part about site-packages in UbuntuMarcin Juszkiewicz1-14/+0
Turned out that since we commented mangling of system-wide Python packages nothing broke. So let's get rid of that part. Change-Id: I9e3a4424c584fb14cca50bb0b9392f7227161acc
2020-01-10base: use install_packages() macro to install packagesMarcin Juszkiewicz1-6/+2
Change-Id: I4cde9ca95dabf728a83ac338f7964911ac52f65a
2020-01-10CI: use Debian/Ubuntu mirrors in base imageMarcin Juszkiewicz1-0/+2
So far we built 'base' image using upstream mirrors and then replaced them with OpenStack infra ones. Let do that right after we copy own APT sources.list file. Change-Id: Icb745f628c1c50d9f20df022b08ddc46fccc270c
2020-01-09CentOS 8: base and openstack-base imagesMark Goddard1-30/+110
Adds support to the base and openstack-base images for CentOS 8. These images have been removed from the list of unbuildable images, and replaced with all dependent images. Change-Id: I18fba8a5c2f99b700990cbf41c76077a1ec2408a Partially-Implements: blueprint centos-rhel-8
2020-01-09Remove tgtd and scsi-target-utils support in CentOS/RHEL 8Maciej Kucia1-1/+5
In CentOS/RHEL 8 there is no scsi-target-utils package, nor is it available in EPEL. In RHEL 7 and beyond the LIO kernel subsystem can be used instead of the tgtd daemon. This change removes support for the SCSI target daemon on CentOS/RHEL 8. The 'tgtd' image is no longer available for CentOS/RHEL 8. Change-Id: I56f230d66f75dd0546325676278f91579f08c822 Signed-off-by: Maciej Kucia <maciej@kucia.net> Co-Authored-By: Maciej Kucia <maciej@kucia.net> Co-Authored-By: Mark Goddard <mark@stackhpc.com> Related: blueprint centos-rhel-8 Depends-On: https://review.opendev.org/631479/
2020-01-02centos: disable EPEL by defaultMarcin Juszkiewicz1-0/+1
Our images use 'scsi-target-utils' from EPEL and then can be built without it. So let's disable this repository right after installing package from it. Images can enable EPEL with 'enable_extra_repos' macro. Also added 'disable_extra_repos' macro as we have some images in a need. Change-Id: Id70474e7602b531b63fdc11ae690fd9ed33def74
2019-12-17docker: fix 'Empty continuation line found' warningsMarcin Juszkiewicz1-4/+4
Whitespaces suxx ;D Change-Id: I4bfd437c914680a5dcbc67dfe9b0a9a74e2eb35d
2019-12-16Merge "base: unify CentOS packages list"Zuul1-30/+9
2019-12-16Merge "Refactor Apache httpd setup"Zuul1-2/+2
2019-12-13base: unify CentOS packages listMarcin Juszkiewicz1-30/+9
For infra images work we need 'base' image to be 'install_type' agnostic. So it will be the same when built for 'binary' or 'source' install type. Change-Id: Ied4a00e8866560d39004a34d6857ac62e22e2c0c
2019-12-13Merge "Build images with healthcheck scripts for core services"Zuul1-0/+9
2019-12-11Refactor Apache httpd setupMark Goddard1-2/+2
All Apache httpd setup has been moved to a new helper script, kolla_httpd_setup. This includes the existing clean of /run/httpd, /var/run/httpd, /tmp/httpd etc. Horizon has an additional bit of Apache config for Debian/binary, which has been kept in extend_start.sh for horizon. Change-Id: Ia2af74b69c151db0bd7e452460b0babcee50b282 Related: blueprint centos-rhel-8
2019-12-09Build images with healthcheck scripts for core servicesMichal Nasiadka1-0/+9
blueprint container-health-check Now docker supports healthcheck directive[0] in Dockerfile, which is helpful for checking container aliveness. Base for this patch were healthcheck scripts from tripleo[1]. [0] https://docs.docker.com/engine/reference/builder/#healthcheck [1] https://github.com/openstack/tripleo-common/tree/master/healthcheck Change-Id: Ifc32713cd4d6b45c74855c0ebf5bb65784701d44
2019-12-09base: use upstream dumb-init on all architecturesMarcin Juszkiewicz1-24/+0
In past we were building 'dumb-init' from source. Then in commit f8fd56056114af7e2c8b8185cd258c6fd3993c8c we moved to using binaries from Debian packages instead. With keeping compiler... Now Travis CI supports all architectures we care about. So dumb-init upstream built all binaries for us. Good bye compiler stuff. 115 megabytes saved. Change-Id: I08e0e564908e6abb279a73f08cad4c851395ca47
2019-11-29Enable repos only when neededMarcin Juszkiewicz1-0/+17
Disable external repositories by default and enable only when needed. Depends-on: https://review.opendev.org/696480 Implements: blueprint repos-off-by-default Change-Id: Icf2a8397a8349e0fe849d88d160409fd234480a9
2019-11-28Ensure lsb-release exists on debian/ubuntuDincer Celik1-1/+3
Change-Id: I74142928d97af932a04e33476771360579e01ee7 Closes-Bug: #1853474
2019-11-21Merge "base: generate en_US.UTF-8 locale data for Debian/Ubuntu systems"Zuul1-0/+3
2019-11-14Merge "Revert "Move to RDO Train packages""Zuul1-2/+0
2019-11-14base: generate en_US.UTF-8 locale data for Debian/Ubuntu systemsMarcin Juszkiewicz1-0/+3
Change-Id: Id2463692f5a633b6e50af6e7ce6e3f49612e4c5d Closes-bug: #1852452
2019-11-13Revert "Move to RDO Train packages"Radosław Piliszek1-2/+0
This reverts commit c78c82c9630b334cbaef040d68bce7e5ae8cc118. Change-Id: I61c68bf738673a96dd5ba256e40e8532364ff281
2019-10-29Merge "base: use en_US.UTF-8 locale on all distros"Zuul1-1/+1
2019-10-29Merge "Remove /var/yum/cache from CentOS base image"Zuul1-5/+2
2019-10-29base: use en_US.UTF-8 locale on all distrosMarcin Juszkiewicz1-1/+1
C.UTF-8 is not supported in RHEL 7: https://bugzilla.redhat.com/show_bug.cgi?id=1361965 Closes-bug: #1850035 Change-Id: I20dcb86e7e119b9f5ca44cd066fcb9cb84af1ce4
2019-10-28Remove /var/yum/cache from CentOS base imageMark Goddard1-5/+2
Since https://review.opendev.org/#/c/682600/, the following lines result in /var/yum/cache being present in one of the layers of the base image: RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }} \ {% for repo in base_centos_yum_repos_to_disable | customizable('centos_yum_repos_to_disable') -%} && yum-config-manager --disable {{ repo }} \ {% endfor -%} {% for key in base_centos_yum_repo_keys | customizable('centos_yum_repo_keys') -%} && rpm --import {{ key }} \ {% endfor -%} && /bin/true {% block base_centos_repo_overrides_post_yum %}{% endblock %} RUN {{ macros.rpm_security_update(clean_package_cache) }} This is because it is not cleaned in the first RUN statement. This adds 76MB to the image. Also, using two separate RUNs which results in an extra 23MB due to updates to /var/lib/rpm/Packages. Found via https://github.com/wagoodman/dive. Change-Id: I0302ee1dfc10a2b7df127ac6a7764a84b1d74a33 Closes-Bug: #1850036
2019-10-26Merge "Move to RDO Train packages"Zuul1-0/+2
2019-10-21Move to RDO Train packagesMichal Nasiadka1-0/+2
Change-Id: I396f929ecc11f87fb83585bedd39be93a605c57b
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-06 21:44:14 +0000