summaryrefslogtreecommitdiff
path: root/docker/swift/swift-object-expirer
AgeCommit message (Collapse)AuthorFilesLines
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 (cherry picked from commit 190a6f7a264c1ea8c0c565d2b75fb73fdc29d500)
2019-01-17Use base_package_typeAlex Schultz1-2/+2
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
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-03Override image's meta info.Jawon Choo1-1/+1
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.j2Chen1-1/+1
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 Juszkiewicz1-1/+1
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-05Remove include_header and include_footer in all DockerfilesJeffrey Zhang1-1/+0
include_header and include_footer parameter is already removed, remove them in all Dockerfiles. Add missing footer block. Change-Id: I90da03eb9f95a3827361d5f5ede65fde7d6be2b3
2016-11-03Remove Fedora supportChristian Berendt1-1/+1
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-01-15Share the same image between swift servicesJeffrey Zhang1-15/+0
Get rid of swfit children images by share the same image in the swift account, swift object and swift container services Closes-Bug: #1534476 Change-Id: I929689f93b56396a41b19fda46e4679c4de84ca1
2015-11-23Remove hardcoded MAINTAINER in DockerfilesSwapnil Kulkarni (coolsvap)1-1/+1
Added new option in kolla-build.conf Change-Id: I45fe51966bcb59ea19d112281ba3d5a1ba091a56 Closes-Bug:#1514304
2015-11-09Fix validate-all-maintainer.sh to look for Dockerfile.j2Angus Salkeld1-1/+1
And fix the fallout. Change-Id: Iccad3f4fdb0a6a7c14246df3408cae0425b833a5
2015-10-06Common start.shSam Yaple2-11/+0
The majority of the start.sh code is identical. This removes that duplicate code while still maintaining the ability to call code in a specific container. The start.sh is moved into /usr/local/bin/kolla_start in the container The extend_start.sh script is called by the kolla_start script at the location /usr/local/bin/kolla_extend_start . It always exists because we create a noop kolla_extend_start in the base directory. We override it with extend_start.sh in a specific image should we need to. Of note, the neutron-agents container is exempt from this new structure due to it being a fat container. Additionally, we fix the inconsistent permissions throughout. 644 for repo files and the scripts are set to 755 via a Docker RUN command to ensure someones local perm change won't break upstream containers. Change-Id: I7da8d19965463ad30ee522a71183e3f092e0d6ad Closes-Bug: #1501295
2015-09-28Merge "Implement a install_type and install_metatype"Jenkins1-1/+1
2015-09-28Implement a install_type and install_metatypeSteven Dake1-1/+1
This prepares for the RHEL OSP implementation by making the build tool convert all binary-* into an install_type of binary and * into an install_metatype variable substitution inside the Dockerfiles. Further binary-* is substituted as install_name to enable proper building only. Change-Id: Ib681b29176eb79a3cab12ec824313fdecb6e7a5f Partially-Implements: blueprint rhel-based-image-support
2015-09-27remove set_configsSam Yaple1-4/+0
Change-Id: I9bb0a1fac63cc326234b0f06b1e56b43e0753279 Partially-Implements: blueprint replace-config-external
2015-09-25Fix removal of config-externalSam Yaple1-1/+0
I removed the files but not the COPY commands thus breaking all of Kolla Change-Id: I37d3e0cb94a1ecc12971f485f953310ba8fee53c Partially-Implements: blueprint replace-config-external
2015-09-25Remove config-external.shSam Yaple1-33/+0
Removes config-external for all services that have been replaced in Ansible Change-Id: I839a14418638b977fbc1d02ba6839811b0f909ea Partially-Implements: blueprint replace-config-external
2015-09-25Replace config-external - swiftSam Yaple1-7/+4
Change-Id: I785cb53d64cbf8dbc0fad97882f9fd0307982e5d Partially-Implements: blueprint replace-config-external
2015-09-13Merge "Add missing Swift services, also ansible configuration"Jenkins2-15/+28
2015-09-07Add missing Swift services, also ansible configurationjamesmmccarthy2-15/+28
DocImpact Closes-Bug: #1477993 Co-Authored-By: Paul Bourke <paul.bourke@oracle.com> Change-Id: Ifeab0fec11889cb0c90a56a6211dbdd27a40f3d9
2015-09-04Add 'rhel' for RPM distrosSteven Dake1-1/+1
Add 'rhel' to list for RPM based distros. Also sort the distro list for rpm packages for affected lines. Change-Id: Ied4cb3e9763d6c6359f314d16185383ac3e006ed Partially-Implements: blueprint rhel-based-image-support
2015-08-28Move docker_templates to docker dirSam Yaple3-0/+54
Updated build.py to reflect this change. Deprecate --template option and make it a noop. Change-Id: I7cd98d1ee684a4c64984a49597159868152683b2 Partially-Implements: blueprint remove-docker-dir