aboutsummaryrefslogtreecommitdiff
path: root/docker/swift
AgeCommit message (Collapse)AuthorFilesLines
2025-03-21Remove swift container imagesMichal Nasiadka9-160/+0
Change-Id: I05a96f27b47a0f87bcf435872dd08ec0927232e3
2025-02-06Install pycadf from pypi packageMichal Arbet1-1/+1
Previously, the `pycadf` package did not include configuration files, so they were manually installed from source. However, this was fixed in pycadf's upstream in [1], allowing us to rely on the package itself. Additionally, the `ceilometer_api_audit_map.conf` file has been removed, as it was dropped in pycadf's upstream commit here [2] [1] https://review.opendev.org/c/openstack/pycadf/+/936741 [2] https://review.opendev.org/c/openstack/pycadf/+/930971 Change-Id: I022aa4c403f08385beb83b5d0c81f8abb42eb4a7
2024-11-15Add mechanism for patching files in containersMichal Arbet7-0/+14
This patch adds a way to patch files in a Docker image built by Kolla. This is very useful for several reasons, specifically: - Custom modifications - The stable branch of some library has a fix but no pip package has been released - Eliminates the need to package your own pip packages - Eliminates the need to invent your own versioning to prevent upstream versioning - Eliminates the need to manage a pip server - In other words, it eliminates the need to get a wheel into the image and install it manually using any method not previously mentioned It is also highly desirable because, although Kolla can replace the source for a service with a custom URL for a tarball or its own Git repo, it cannot do this for dependencies pulled from pip. I would also like to point out that this is a feature with its own code path and works only if the user "inserts" a patch into the folder patches/docker-image/something.patch and creates an analogous series file for patch source code. Simply said, this code will never interfere with the upstream build process since this feature is not intended for use in upstream. It is rather meant for downstream users who know what they are doing. Now they just have an option to patch their images. Everything works on all layers of the Docker image and stores a report of applied patches which can then be seen in /etc. This mechanism is similar as debian patch quilt. Change-Id: I61d0790c5d4d070b7ea9e8c99c0a76ff5d22bf9d
2024-04-24swift-base: fix rsync missing for rpm installsSven Kieske1-0/+1
Closes-Bug: 2062072 Change-Id: Id6e4bbe0aab2360c4e7e5f74fff6170bcc71080b Signed-off-by: Sven Kieske <kieske@osism.tech>
2024-01-17Fix openstack CADF audit maps and installationMichal Arbet1-0/+1
This patch fixes missing pycadf's audit maps for services and change the way how pycadf is installed. Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/905858 Closes-Bug: #2047941 Change-Id: I9b43d1a9990ad8aa7381ea81b0f2d692967be949
2023-11-27Swift: Remove unused rootwrapTakashi Kajinami4-43/+0
Swift does not use oslo.rootwrap. Thus the command and its config file is just useless. Change-Id: If4e346c2db841aad9b2ddac049dbbbc1ba5782ec
2022-10-10Fix writable rootwrap/privsep configRadosław Piliszek1-1/+1
Fixes a hypothetical security issue related to privilege escalation via rootwrap/privsep. A potential vulnerable service could previously allow writes to its rootwrap/privsep config and thus allow for more commands to be run with root privileges via rootwrap/privsep. For a succesful attack, this would also require the service to allow to run arbitrary commands via rootwrap/privsep. Thus far, no such vulnerabilities have been reported and thus this fix is simply strengthening the container images against such an issue in the future. Change-Id: I92c81c77e6a16570a108cde8031f7977930fb02a Closes-Bug: #1874298
2022-04-21flatten images a bitMarcin Juszkiewicz1-7/+6
As we have one type of images now some RUN calls could be merged so we will have less layers in resulting images. Change-Id: I5178c58fbd8c65efe825dc249c0f1368ef0fe8e0
2022-04-11Adjust permissions on _extend_start files.Tim Shearer1-1/+1
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-09docker: drop binary partsMarcin Juszkiewicz6-98/+12
Big patch drops all mentions of binary images support. Suggestions are welcome how to split it into parts or handle better. Change-Id: I5d5a46c6ce7734ceb8b844e17b43e359d7cac6e3
2021-11-18Add Swift lock path in Swift containersStanislav Dmitriev1-2/+2
Swift-recon-cron requires rw access to the lock path specified in in object-server.conf file. Currently it doesn't exist in Swift containers Closes-Bug: #1926203 Change-Id: Id3f824b741a5aa98efc7162fb7d49657e86a2bee
2021-01-03remove unicode from codelikui1-1/+1
Change-Id: I616ab0d81b961effaa3b4a8639b1d06327473f08 Implements: blueprint remove-unicode
2020-11-24swift: fix group membership in debuntu/binaryMark Goddard1-0/+5
The UCA packages seem to be removing the swift user from the kolla group. Explicitly add it after installation. Closes-Bug: #1905279 Change-Id: I51c7c6e2f520a582de0409025eb5d1a6da2952a2
2020-08-07ubuntu: move to 20.04 FocalMarcin Juszkiewicz1-11/+4
There is a time once every 2 years when ubuntu team releases new LTS release. And then UCA joins with binary packages for current OpenStack development cycle. It is this time for Ubuntu 20.04 'focal'. Depends-On: https://review.opendev.org/745156 Change-Id: I045aa6b4b4fd83fbe7d1fda89549f0ef1e88ec12
2020-04-15Merge "Remove support for CentOS 7"Zuul1-9/+1
2020-04-15Remove support for CentOS 7Marcin Juszkiewicz1-9/+1
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-08swift: use python3 for scriptsMarcin Juszkiewicz1-1/+1
We no longer ship Python2 in images so use Python 3 in scripts. Change-Id: I428099d66715d6156a891d6f682f52e49f1b7753
2020-03-01Add block labels to all DockerfilesChristian Berendt7-0/+14
Change-Id: I9692dda817ef134d647247431565e1b58cf9da41
2020-02-19Drop weird swift rootwrap config (xenapi with placeholder values)Radosław Piliszek1-7/+0
Change-Id: I5514c53002a9e772b96e767b10fddf6342c7eb1d
2020-01-20Fixes swift-object-expirer for Debian and Ubuntu binary images.Dincer Celik1-1/+1
Replaces 'swift-object' package with 'swift-object-expirer' package. Change-Id: I8fa3fcad88b35743e042d8a62ccee722b08af673 Closes-Bug: #1859607
2019-11-05swift-rsyncd: don't recursively chown /srv/node at startupMartin Chlumsky2-3/+3
Instead of doing a recursive chown on /srv/node, chown only /srv/node and any immediate subdirectory under /srv/node. Change-Id: I8fd93fa77ba9fc63910360300b8783a34bd4e6d5 Closes-Bug: #1851169
2019-10-03swift-proxy-server: Ubuntu is still on Python 2Marcin Juszkiewicz1-4/+11
Change-Id: Ie174d1154bfe9295e5dae05ac885a5fa88487d4d
2019-10-02Merge "swift-proxy-server: use Python 3 for Debian/Ubuntu"Zuul1-1/+1
2019-10-01Install rsync in swift-base containers on Debian/UbuntuMark Goddard1-10/+16
This is used by the replicator services. Change-Id: Iad7ad20542a159469d95e990c20564633046b251 Closes-Bug: #1846207
2019-10-01swift-proxy-server: use Python 3 for Debian/UbuntuMarcin Juszkiewicz1-1/+1
Change-Id: I035c4fe7308adb851f93753a8e71fec8965c6704
2019-03-12Add python3 packages for RHEL systemsAlex Schultz1-1/+9
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
2019-01-17Use base_package_typeAlex Schultz7-16/+16
This change updates the docker files to use base_package_type instead of doing specific distro checks for the rhel/deb generic cases. The base_distro is still available and is used when a specific distro needs a customization but if the differences are purely rpm vs deb, then the base_package_type can be used. Change-Id: I8d720bb185df65a0178061ccf20b1ab2265da2c5
2018-08-06Revert the patch set "Apply Swift rolling upgrade"Ha Manh Dong3-20/+0
Due to there is no way to execute swift graceful shutdown commands from swift-bootstrap container to swift service containers, so we need to revert the patch set at [1]. [1] https://review.openstack.org/#/c/560248/ Change-Id: I3363895347c535054584d63e22284c211ca38ad6
2018-07-13Apply Swift rolling upgradeconfi-surya3-0/+20
Apply Swift rolling upgrade based on recommendations from Swift PTL John Dickinson at [1] [1]https://www.swiftstack.com/blog/2013/12/20/upgrade-openstack-swift-no-downtime/ Co-Authored-By: Duong Ha-Quang <duonghq@vn.fujitsu.com> Co-Authored-By: Ha Manh Dong <donghm@vn.fujitsu.com> Change-Id: Ic59a2d2dda3469af5d4259e020d22b619ff7d603 Implements: blueprint apply-service-upgrade-procedure
2017-12-12Remove old unused script from swift-basePaul Bourke2-97/+0
build-swift-ring.py is an ancient artifact from early Kolla days when Swift was first implemented. It's not documented nor recommended to be used. Change-Id: I98f567067e455344ed68774cb35c3f3db26be74d
2017-11-28Update swift for replication issuesJames McCarthy2-4/+7
There are corresponding ansible changes to go with these image changes - add nc to swift image, and create dir for lock files. nc allows for rsync replication to easily target {{ swift_rsync_port }} change the lock file location for swift user to access - see bug for more details. Change-Id: I78826aeee35601ff65cbe50932482ef2f68346ae Closes-Bug: #1733851
2017-06-09Clarify comment about swift-object-expirer for RDOMartin André1-2/+1
The rational for packaging swift-object-expirer in openstack-swift-proxy is detailed in https://bugzilla.redhat.com/show_bug.cgi?id=1382921 It is a conscious packaging choice and not a bug, and as so update the comment in swift-object-expirer image. Change-Id: Ibccfa1482d3aeccf86a57603d9dedecbcc7d097c
2017-05-18Add ceilometermiddleware in swift-proxy-servershaofeng_cheng1-2/+16
Add ceilometermiddleware package in swift-proxy-server image. Change-Id: I4075d14211778347afe7c03b661723f5a8e18c7a Closes-Bug: #1691629
2017-05-03Override image's meta info.Jawon Choo7-7/+7
centos based images have wrong label info, these changes fix own image's name and build-date. Change-Id: I1d13f8f386c8db12b5fbe5f8ecbbf9e3fbb4ba1c Closes-Bug: #1680341
2017-04-20Use LABEL instead of MAINTAINER (deprecated) in all Dockerfile.j2Chen7-7/+7
Use LABEL instruction instead of MAINTAINER (deprecated) instruc- tion as suggested by Docker's official dockerfile guide. docs.docker.com/engine/reference/builder/#maintainer-deprecated Closes-Bug: #1683652 Change-Id: Ie87a1ddf31aefcd0b623fd2837d78de420e76898
2017-04-04debian: enable all images enabled for UbuntuMarcin Juszkiewicz7-10/+10
Debian support is not maintained in Kolla so it got a bit behind Ubuntu one. This changeset enables Debian for all images. Jessie (even with backports) may be too old for some images though. Also unify distro check to ['debian', 'ubuntu'] to keep alphabetical order like it is done for RPM distributions. Partially-Implements: blueprint multiarch-and-arm64-containers Change-Id: I056233fbfa277e0e2360c07c3f80d9558c554357
2017-02-17Use install-pip macro in most source imagesChao Guo1-1/+6
1. Enable customization of pip packages in source branch of most images 2. All pip packages install uniformly through install-pip macro, user can easily customize his own pip command (For example using a mirror) Co-Authored-By: Mauricio Lima <mauriciolimab@gmail.com> Change-Id: If09582039f690fa4136e8f33200d5da15e092da7
2017-02-05Remove include_header and include_footer in all DockerfilesJeffrey Zhang6-6/+0
include_header and include_footer parameter is already removed, remove them in all Dockerfiles. Add missing footer block. Change-Id: I90da03eb9f95a3827361d5f5ede65fde7d6be2b3
2017-01-28Fix swift dockerfilezhubingbing1-10/+9
* remove /var/log/swift * fix code format Change-Id: If10e668ed612df76c91e54947cf11910f7f1c707
2017-01-17use static uid/gid in imagesSam Yaple1-5/+4
This centralizes all user and group creation into a single source. This will fix any current and furture uid/gid mismatches (such as with nova-libvirt). In the process, we also unify users between the distros in a standard way. The users in the following containers change from thier defaults: Ubuntu: _chrony user is now chrony Ubuntu: memcache user is now memcached All: qemu user is used for ownership and socket permissions All uid and gid numbers are customizable via kolla-build.conf Co-Authored-By: Kris Lindgren <klindgren@godaddy.com> Change-Id: I120f26ab0683dc87d69727c3df8d4707e52a4543 Partially-Implements: blueprint static-uid-gid
2017-01-05Remove footer block and variable in *-base imagesJeffrey Zhang1-1/+0
Change-Id: I39aa88489f744f779150695f3f55ef80d42e1c61 Closes-Bug: #1653247
2016-12-26Remove unneeded oslo-rootwrap in swift-baseChao Guo1-6/+9
Oslo-rootwrap is not needed by swift, so remove it. Change-Id: Ic35ffabc7078fd66b2626ad5622a1585794f5d62
2016-11-03Remove Fedora supportChristian Berendt7-8/+8
Closes-bug: #1616387 Change-Id: Id97f88b9baa3d48d33ce120962450a374282d044
2016-10-11ansible: swift: Fix swift-object-expirer restart loopOtavio Salvador1-0/+25
The swift-object-expirer is provided by the 'openstack-swift-proxy' package and thus it is unavailable on swift-object image. This change adds a new Docker image to fulfill this requirement and stop using swift-object image in this case. This image is needed while RDO does not fix the packaging. The issue is being tracked in: https://bugzilla.redhat.com/show_bug.cgi?id=1382921 Change-Id: Idc7ee92d756d8923da2198ede33abf5ed1142041 Closes-Bug: 1630425
2016-09-13Add header blocks to all DockerfilesPaul Bourke6-0/+12
Change needed to add header blocks to all Dockerfiles, similar to the base. Use case is to easily run something before packages are installed, e.g. to COPY a local rpm in that can be added to the package list. Change-Id: I1bbfdf0b762da0a392aa8bf47781315b45377bee Closes-Bug: 1618969
2016-08-28Fix bandit gate jobsPaul Bourke1-2/+5
* Inspected each error and fixed / added nosec where appropriate. * build-swift-ring.py which was throwing sec errors is no longer used so removed it. * Removed the dev/ directory from being checked. Closes-Bug: #1617713 Change-Id: I25664cabca4137e5c9f499c1af3f5ce78b86fb56
2016-08-19Handle empty package list for install_packagesShaun Smekel6-7/+7
Currently if the install_packages macro is run with an empty package list, it will add a yum or apt-get command with no packages listed. This bug fix aims to omit this line when no packages have been given, or, the operator wants to use the "_override" / "_remove" functionality to disable all packages being installed in a Dockerfile. Co-Authored-By: Paul Bourke <paul.bourke@oracle.com> Change-Id: Ifaaaebfccc3adb0f2f68a35ac08e59378bc87fdb Closes-bug: 1612446
2016-08-12Customizations for SwiftShaun Smekel6-65/+51
This patchset contains customization of Dockerfile of Swift containers. Change-Id: I69250c4d9f6cc3949c9b9b52ea4b0cc2aec0231e Partially-implements: blueprint third-party-plugin-support
2016-07-05Fix the overwrite sudoers file issueJeffrey Zhang1-2/+2
Change-Id: I4b109f7fdc3b8e49defed26979b04ca158842e98 Closes-Bug: #1598423
2016-06-04Make swift-base container build with debianBenedikt Trefzer1-1/+1
- add debian as base_system Change-Id: I1d0f1e5de819e8325243fa0b971c1eb7b83fb5b5 Partially-implements: blueprint build-debian