summaryrefslogtreecommitdiff
path: root/docker/base/Dockerfile.j2
AgeCommit message (Collapse)AuthorFilesLines
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
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