summaryrefslogtreecommitdiff
path: root/docker/base
AgeCommit message (Collapse)AuthorFilesLines
2020-01-30CentOS 8: Use upstream Ceph/masterMichal Nasiadka2-0/+45
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"Zuul2-31/+111
2020-01-29CentOS 8: base image fixes for RabbitMQ, fluentd & InfluxDBMark Goddard3-8/+8
- 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-24Add error message when merge failsAlex Schultz1-1/+9
If the source cfg directory contains a path (e.g. /etc/pki/ca-trust/extracted/) which is also bind mounted into the container as read-only, when it attempts to merge the paths together the resulting exception doesn't really indicate what happened. Change-Id: I73bbfd31586012e1fd64d30f9ce1d7eb2256d210 Related-Bug: #1860607
2020-01-21Merge "centos: disable EPEL by default"Zuul1-0/+1
2020-01-20Debian: ceph-osd wants smartmontools from backportsMarcin Juszkiewicz1-0/+5
Change-Id: Ibe82479d5225961758a96f763d9bb674731aab23
2020-01-15Debian: enable backports repoMarcin Juszkiewicz2-0/+7
We get Ceph 'nautilus' that way to be in sync with CentOS and Ubuntu. So far only ceph is taken from backports repo. Change-Id: I9d13ad8a6a610bcf000d3850b77af80d10d66ba7
2020-01-14Merge "base: use install_packages() macro to install packages"Zuul1-6/+2
2020-01-14Ubuntu: use local APT mirrors if possibleMarcin Juszkiewicz1-3/+3
APT has a way to fetch mirror list and autoselect best mirror. Change-Id: I8209770ca1353fd89aacef0859ca3a373645c6b2
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-11Merge "base/ubuntu: use 'ussuri' packages from UCA"Zuul3-3/+3
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-10base/ubuntu: use 'ussuri' packages from UCAMarcin Juszkiewicz3-3/+3
Change-Id: Ia977d60e170efc1d4567bcea7f318b9d87233458
2020-01-09CentOS 8: base and openstack-base imagesMark Goddard2-31/+111
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-21CentOS 8: work around mod_ssl certificate issueMark Goddard1-0/+9
CentOS 8 has an issue with mod_ssl which produces an invalid Apache configuration in /etc/httpd/conf.d/ssl.conf. This causes the following error on startup: SSLCertificateFile: file '/etc/pki/tls/certs/localhost.crt' does not exist or is empty Work around this by generating certificates manually. Partially-Implements: blueprint centos-rhel-8 Change-Id: Id8bcefa3527575ba72fe37013787ba716e435ac8
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"Zuul2-2/+20
2019-12-13Merge "Use APT pinning to set preferred version of RabbitMQ"Zuul1-0/+3
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"Zuul6-0/+62
2019-12-12Use APT pinning to set preferred version of RabbitMQMarcin Juszkiewicz1-0/+3
We want RabbitMQ 3.7.10-1 for Ubuntu. So set it in one place which is designed for such things instead of doing it everytime we want to install it. Change-Id: Ib2b2d4e392aaf77bcdec24f9f5551cdf15d32d91
2019-12-11Refactor Apache httpd setupMark Goddard2-2/+20
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-09Merge "base: use upstream dumb-init on all architectures"Zuul1-24/+0
2019-12-09Build images with healthcheck scripts for core servicesMichal Nasiadka6-0/+62
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-12-04sensu-client: use docker.io on Debian/UbuntuMarcin Juszkiewicz1-3/+0
There is no need to use external Docker repo for an image which just needs Docker client. Change-Id: I61387287eb3d144ba1686d95b38f95c8292f5b0d
2019-11-29Enable repos only when neededMarcin Juszkiewicz11-27/+69
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-30Merge "Change ODL repo to nexus.opendaylight.org"Zuul1-3/+2
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-28Change ODL repo to nexus.opendaylight.orgMichal Nasiadka1-3/+2
Change-Id: I242945edba84b891ccbf82d5fcce8ef5fe37ad3d
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-24Merge "get 'apt_*' options of kolla-build.conf working again"Zuul3-0/+4
2019-10-23base: drop not used apt preferences for UbuntuMarcin Juszkiewicz1-4/+0
We used APT preferences to limit Ubuntu to Ceph 'mimic' (13.x) but those packages are no longer present so we got Ceph 'nautilus' (14.x) in our images. So let's drop not used settings. Change-Id: I51da99efedc0b11c8ff529475f7878e6d9f5e63f
2019-10-21Move to RDO Train packagesMichal Nasiadka1-0/+2
Change-Id: I396f929ecc11f87fb83585bedd39be93a605c57b
2019-10-17get 'apt_*' options of kolla-build.conf working againMarcin Juszkiewicz3-0/+4
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 Michalek4-1/+37
Change-Id: I0fd596d93a0e575a391250d4bed261ad370a3664