summaryrefslogtreecommitdiff
path: root/docker/base
AgeCommit message (Collapse)AuthorFilesLines
2022-04-11Adjust permissions on _extend_start files.Tim Shearer1-1/+2
Explicitly set the permissions on the kolla-toolbox kolla_extend_start file. Also, since all extend_start files are sourced rather than executed, the executable bits are now cleared throughout the project. Change-Id: I5c2deb4a2e33575d57c852089f856a9acc6818d0
2022-04-05Merge "Emit log when copying file/directory permissions"Zuul1-0/+1
2022-04-05Emit log when copying file/directory permissionsYamato Tanaka1-0/+1
Currently, kolla sets file permissions at _set_properties_from_file() method, but no logs are emitted here. This can make it difficult to investigate the cause of issues which are caused by setting permissions. This patch makes _set_properties_from_file() output a log. Closes-Bug: #1966825 Change-Id: I91116931aa30fd2c5e51ed1ac04663fcfa4a5f36
2022-03-31Fix disabling of curlrc in healthcheck_curlPierre Riteau1-1/+1
The -q (aka --disable) option only works if it is the first parameter on the command line. Change-Id: Ia9ab0bdc95e658c17e5be5abefcf96f1c05ee84f Closes-Bug: #1967272
2022-03-11Unify curl use (customisation options)Maksim Malchuk1-0/+7
This change adds and unifies an ability to override hardcoded URLs for air-gapped environments via the usual blocks mechanism. Also, this change replaces ENV with ARG instruction for the variables used only in building images, and uses bash variable expansion where it possible. This change is a continuation of the I46b77978926fc2b578a68d1aaa944b2198af0685 Change-Id: I1fbad333b1bc95484e6f4c5145d5936a0e2db84f Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
2022-03-07Debian: use Yoga OpenStack reposMarcin Juszkiewicz1-1/+1
Change-Id: I27910e25183a373d0d89ea6f9f4e30e118f21422
2022-02-21Debian: use libvirt 8 and qemu 6.2Marcin Juszkiewicz1-1/+5
Libvirt 8 got recently backported to bullseye so we can make use of it. QEMU 6.2 was already available but conflicted with libvirt/bullseye. Also started listing which packages we want from backports. Change-Id: I335e5748e9624fe470adbaf6a6f080a3ae468f04
2022-02-11Merge "rabbitmq: update to 3.9"Zuul2-5/+4
2022-02-09rabbitmq: update to 3.9Michal Nasiadka2-5/+4
Also update Erlang to 24 Change-Id: Ifbaccc54896bab096a6d16dc7733941dd600cf39 Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/828594
2022-02-08Merge "erlang: use packages from Erlang Solutions on AArch64"Zuul2-2/+8
2022-02-05erlang: use packages from Erlang Solutions on AArch64Marcin Juszkiewicz2-2/+8
RabbitMQ requires Erlang 23+ and soon will bump to 24+. On AArch64 we used version 22 as there was no other option. Now it is. Change-Id: I667ccda5bb4edbfbfb97dfb0cea264837ed05cae
2022-02-05pin out some package from Debian OpenStack Team reposMarcin Juszkiewicz1-0/+5
Debian OpenStack Team backports many packages to get their stuff done. Sometimes something goes wrong: INFO:kolla.common.utils.kolla-toolbox:The following packages have unmet dependencies: INFO:kolla.common.utils.kolla-toolbox: git : Depends: git-man (< 1:2.30.2-.) but 1:2.34.1-1~bpo11+1 is to be installed INFO:kolla.common.utils.kolla-toolbox:E: Unable to correct problems, you have held broken packages. So let pin out problematic packages as we are fine with bullseye version of git. Change-Id: I8c740655c7f7803d9ab36dac79d30e35e65dd586
2022-02-04Switch to use Yoga binary packagesMarcin Juszkiewicz2-2/+2
At R-8 week we are moving to current release binary packages for CentOS and Ubuntu (Debian OpenStack team do not publish before RC). Change-Id: I5e620cd07326b3d69b07f7c4667176918d7c1b24
2022-01-31Merge "Ensure set_configs sets execute bit on directories"Zuul1-0/+10
2022-01-28Ensure set_configs sets execute bit on directoriesJakub Darmach1-0/+10
While handling permissions for directories, set_configs.py configures them same as for files - i.e. 0640 set in config.json which works fine for file will cause any potential subdirectories to lack traverse permission. Check and permission change was added to handle_permissions function to add +x if +r is present for user, group, others. Change-Id: Ic6e3ae4ff40c6ce5a5c0646ed309a2938903f6c0
2022-01-27Unpin td-agent and cap elasticsearch gemDr. Jens Harbott2-10/+0
With [0] the version of td-agent being installed was pinned, which isn't sustainable in the long run, so we drop the pin. Latest version of the elasticsearch gem no longer works with older (OSS) versions of Elasticsearch. This is fixed by downgrading the version of the elasticsearch gems. [0] Iefcdd3100b7e3c5320bc5f1286a18251bdeab885 Related-Bug: 1930867 Closes-Bug: 1954759 Signed-off-by: Dr. Jens Harbott <harbott@osism.tech> Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/823155 Change-Id: I3045786e863b098d7339d1066aef6c857aa5f97f
2022-01-04base: do not duplicate repo data on CentOSMarcin Juszkiewicz1-29/+16
Instead of listing all repositories twice, do it just once and then add architecture specific ones. Change-Id: Icf0675c17a5227643148e9956496b8eacec67bee
2021-12-28Fix variable nameMaksim Malchuk1-2/+2
TrivialFix The customization format of the variable name should contain the <image_name> [1]. This change fixes the name of the 'remote_apt_keys' variable in base Dockerfile. 1. https://docs.openstack.org/kolla/latest/admin/image-building.html#dockerfile-customisation Change-Id: I423db39e77f337a73d3d88e3dbd56469be45110b Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
2021-12-21Merge "Add HTTP proxy support for fetching APT keys"Zuul1-2/+7
2021-12-21Revert "Workaround setuptools==60.0.0 breakages"Dr. Jens Harbott1-3/+0
This reverts commit b69c58971895a6ab8a23bcdc4b7b56d01f26e2f5. Reason for revert: The original commit was a hotfix to work around build failures, we should try to move back to a normal state again. Change-Id: Iff79de9dabcd4bba795f3c44d3017baa5a860306
2021-12-20Workaround setuptools==60.0.0 breakagesDr. Jens Harbott1-0/+3
Setuptools 60.0.0 is trying to use it's own distutils[0]. Once again. Use the workaround they propose until all pkgs we need have fixed their build processes. [0] https://github.com/pypa/setuptools/blob/main/CHANGES.rst#v6000 Signed-off-by: Dr. Jens Harbott <harbott@osism.tech> Change-Id: I112c0ea510aad80f28fc3f8a9f04cdf09c924b18
2021-12-09Merge "CentOS: do not use advanced-virtualization repo"Zuul1-4/+2
2021-12-08Add HTTP proxy support for fetching APT keysYang Youseok1-2/+7
In network isolated environments the only way to go outside is through HTTP proxy. Make use of it if set. Co-authored-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> Closes-Bug: #1850575 Change-Id: I2718884c4742cb81a3900e38fee62fbd27b472d7
2021-11-22Merge "Use MariaDB 10.6"Zuul2-2/+2
2021-11-16CentOS: do not use advanced-virtualization repoMarcin Juszkiewicz1-4/+2
virt:rhel module provides libvirt 7.9.0 and we have it enabled Change-Id: Id585c7744ba130ad1dfc28138fb0f9e6eeae771d
2021-11-04Use MariaDB 10.6Radosław Piliszek2-2/+2
As planned for Yoga. Change-Id: Ibcfbaa1903c7059e437bb2118bc4c9de4a9b854e
2021-11-02Debian: we want Openvswitch and ovn from backportsMarcin Juszkiewicz1-0/+10
Those packages are in exactly same versions in bullseye-xena-backports and in bullseye-backports. So we have to choose one source to keep builds running otherwise they report downgrading of packages. Change-Id: I0954bcc8ee42b15420fe1cd54aac96cb0c0c7e0d
2021-10-28base: drop commented repositoriesMarcin Juszkiewicz2-44/+4
We moved additional Debian/Ubuntu repositories into kolla/template/repos.yaml quite a while ago. It is time to drop commented out copies from APT sources.list file as no one keeps them in sync. Change-Id: I2bb89a30a88c8b889c5af2fc609e236ed966f7ba
2021-10-04Merge "Move all distros to upstream MariaDB 10.5"Zuul3-0/+16
2021-10-01Merge "logstash: pin to 7.9.* for Elasticsearch OSS compatibility"Zuul2-0/+12
2021-09-30Merge "Avoid the use of --force in groupadd"Zuul1-1/+1
2021-09-30logstash: pin to 7.9.* for Elasticsearch OSS compatibilityMark Goddard2-0/+12
The latest versions of logstash 7.x do not support using the OSS version of Elasticsearch, and fail to push logs if an OSS version is used. This prevents Monasca log API from working correctly. This change fixes the issue by pinning logstash-oss to 7.9.x, the most recent available package in the repo that still supports Elasticsearch OSS. NOTE: logstash 7.11 introduced the breaking change, however 7.10 is unavailable in the package repos. Change-Id: I4ec4eb837c98f57964488769ab82ba8213ad582c Closes-Bug: #1941754
2021-09-28Move all distros to upstream MariaDB 10.5Radosław Piliszek3-0/+16
Per meeting's agreement [1]. [1] https://meetings.opendev.org/meetings/kolla/2021/kolla.2021-09-22-15.01.log.html#l-71 Change-Id: If24c53b3b89eddfaf2cad39fb9e70cea0f770c96
2021-09-27Merge "Debian: use Xena binary packages"Zuul1-1/+1
2021-09-27Avoid the use of --force in groupaddRadosław Piliszek1-1/+1
According to the man page, --force may ignore --gid and this is not what we want. With our ID system it is almost impossible that we hit this issue but better be safe than sorry. ;-) Change-Id: I359982ddd144e07f8296b384638cf0b5331e495c
2021-09-27Merge "Add proxysql image"Zuul2-0/+11
2021-09-27Debian: use Xena binary packagesMarcin Juszkiewicz1-1/+1
Debian OpenStack team provides Xena packages now. Change-Id: I67cb6037ff13de23ad2eb55e6174e9a338525670
2021-09-21Fix stale commented-out repo entryFredericDT1-1/+1
Signed-off-by: FredericDT <frederic.dt.twh@gmail.com> Change-Id: Iee311b60485dc0bb53960700979ada93e4b755b4
2021-09-16Add proxysql imageMichal Arbet2-0/+11
Replacement for MySQL balancing solution provided by haproxy. Needed-By: https://review.opendev.org/c/openstack/kolla-ansible/+/770215 Change-Id: I85ebe3b20294cd9dc847a3582053d3e21f6a2216
2021-09-08Merge "ceph: Update CentOS packages to Pacific"Zuul1-2/+2
2021-09-05Pin td-agent to 4.0.* also on DebianRadosław Piliszek1-0/+5
Debian was missed in the original patch. [1] Backport to Victoria. [1] 6d0882ef799bb531d007c3e6839ef318fd512d5c aka Iefcdd3100b7e3c5320bc5f1286a18251bdeab885 Closes-Bug: #1930867 Change-Id: Id5938697b62ba040062475fcf5215d64e1ba8c6f
2021-09-03ceph: Update CentOS packages to PacificMark Goddard1-2/+2
Updates the CentOS images to use centos-release-ceph-pacific. This is in line with Ubuntu which gets Pacific from UCA. Debian remains on Nautilus. Change-Id: Ie1e77f9c7d83538c051362a8972745f184c72019
2021-08-30Merge "Install UCA GPG key"Zuul1-0/+6
2021-08-30Install UCA GPG keyPierre Riteau1-0/+6
Change Ie19bf46236907d79cb42a5e94cd1067e952b8cbb dropped the Ubuntu Cloud Archive (UCA) GPG key. This results in failures to build Ubuntu container images in Kayobe CI. Change-Id: Ieadf049459b8f6bc4568e2af24d3456ca469501a
2021-08-27haproxy: Use haproxy 2.2.xMichał Nasiadka1-0/+3
For CentOS nfv-extras repository will be used, for Ubuntu - a PPA maintained by Vincent Bernat (Debian developer and package maintainer).. Debian Bullseye already uses 2.2. Change-Id: I7cd753cf66b492c75a185e365cf988cabb9c0142
2021-08-25Merge "Revert "Config: Set default home to /var/lib/{user}""Zuul1-1/+1
2021-08-25Revert "Config: Set default home to /var/lib/{user}"Radosław Piliszek1-1/+1
This reverts commit 33da736668108ded943691d490cb72812c8b150d. Reason for revert: That commit broke bifrost. It needs to be redone and tested with bifrost. Change-Id: I5cb327578f5caf73801d1eedf252bd7ee246dee4
2021-08-24Debian/Ubuntu: handle APT keys in proper wayMarcin Juszkiewicz1-46/+17
apt-key is deprecated and in Debian 'bullseye' it complain when we use it the way we did. The right way is to store key files in separate directory and then, for each repo source file, point to proper key. And this is what this patch does. Both distros use the same keys now. More info: https://michael-prokop.at/blog/2021/02/16/how-to-properly-use-3rd-party-debian-repository-signing-keys-with-apt/ Change-Id: Ie19bf46236907d79cb42a5e94cd1067e952b8cbb
2021-08-23Merge "Config: Set default home to /var/lib/{user}"Zuul1-1/+1
2021-08-19Merge "[release] Use UCA Xena"Zuul2-2/+2