summaryrefslogtreecommitdiff
path: root/docker/barbican
AgeCommit message (Collapse)AuthorFilesLines
2019-12-31create missing apache2 directory on Debian/UbuntuMarcin Juszkiewicz1-0/+1
Ubuntu/source deployment of several images (horizon, placement-api, zun) failed with: + exec /usr/sbin/apache2 -DFOREGROUND apache2: Syntax error on line 80 of /etc/apache2/apache2.conf: DefaultRuntimeDir must be a valid directory, absolute or relative to ServerRoot Change-Id: Ie2a1077f7def0743f1403341985e2109aa490026 (cherry picked from commit 932f09bcd65e15524b5229fdb6bc73a7e0111b27)
2019-10-23Revert to uwsgi-plugin-python for barbican source imagesMark Goddard1-1/+1
Stein only I508bb082a319955b3e008235e158eaa07a1e8a74 was backported to stein to fix an issue with barbican images which contained the python 2 version of uwsgi-plugin-python on Ubuntu/Debian, but should have used uwsgi-plugin-python3. However, in Stein only Ubuntu/Debian binary images used python 3 - not source images. This change reverts to uwsgi-plugin-python for Ubuntu/Debian source. Change-Id: I62c1a42c29ce7273028f99edbb77f4362a2452ce Related-Bug: #1849128
2019-10-22Fix python3 compatibility for barbicanDincer Celik2-2/+2
Barbican refers to python3 but uwsgi refers to python2. This change fixes this issue. Change-Id: I508bb082a319955b3e008235e158eaa07a1e8a74 Closes-Bug: #1849128 (cherry picked from commit 823e45a6c909437a6530c9f34f9e4f5cce8ab79c)
2019-03-12Add python3 packages for RHEL systemsAlex Schultz2-1/+16
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-02-28debian/ubuntu: make use of Python3 based packagesMarcin Juszkiewicz1-1/+1
Both Ubuntu Stein UCA and Debian 'buster' migrated their OpenStack packages to Python 3. Note that Debian 'buster' is not released yet and contains Rocky packages. Stein ones will be available later. Co-Authored-By: Lee Yarwood <lyarwood@redhat.com> Co-Authored-By: Eduardo Gonzalez <dabarren@gmail.com> Change-Id: I160f79cc57f54ec3eac857c5babd1a6e2656d228
2019-01-17Use base_package_typeAlex Schultz4-10/+10
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-12-18Add nfast group to barbican imagesDouglas Mendizábal1-1/+1
The nfast group is needed to configure barbican to use Thales HSM devices with the PKCS#11 plugin. Change-Id: I3de8ca07a34ae63eb91fc8d83bb0676425295cbc
2018-12-11Required changes for mariadb 10.3Eduardo Gonzalez1-1/+1
Mysql-python is a deprecated package and fails to build currently. Make use of mysqlclient as is a fork of mysql-python with many bug fixes a python3 support. percona xtrabackup doenst work with mariadb 10.3, replaces to use mariadb-backup tool. https://jira.mariadb.org/browse/MDEV-15774 Change-Id: Icefe3a77fb12d57c869521000d458e3f58435374
2017-07-31Add httpd to the Barbican API imageJuan Antonio Osorio Robles2-1/+28
We are running barbican over httpd in TripleO, and would like to continue doing so when using containerized barbican. Thus, we need this package in the image as well. Change-Id: I7001855cffeed264cb45305e2aa6fac139ea05c9
2017-05-03Override image's meta info.Jawon Choo4-4/+4
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.j2Chen4-4/+4
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 Juszkiewicz4-5/+5
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-03-28Alphabetize packagesEduardo Gonzalez2-6/+6
Some images have packages sorted alphabetically and some not. Unify common style between all images. Change-Id: I906ed89c10b12886665618752f525ba71d83d991
2017-02-20Merge "Use install-pip macro in most source images"Jenkins1-1/+9
2017-02-19Install uwsgi in Centos binaryMagnus Lööf1-1/+4
Installs `uwsgi-plugin-python` and dependencies in `barbican-api` image. This will resolve problems bootstrapping barbican-api with binary Centos images which otherwise fail to start due to: ``` Running command: 'uwsgi --master --emperor /etc/barbican/vassals --logto /var/log/kolla/barbican/barbican-api.log' /usr/local/bin/kolla_start: line 24: exec: uwsgi: not found ``` Tested with: ``` docker run --rm -ti --entrypoint=/bin/bash kolla/centos-binary-barbican-api:3.0.3 $ uwsgi *** Starting uWSGI 2.0.14 (64bit) on [Sat Feb 18 09:32:12 2017] *** compiled with version: 4.8.5 20150623 (Red Hat 4.8.5-11) on 13 January 2017 23:06:53 os: Linux-4.9.4-moby #1 SMP Wed Jan 18 17:04:43 UTC 2017 nodename: b9063757e276 machine: x86_64 clock source: unix pcre jit disabled ... ``` Closes-Bug: 1634010 Signed-off-by: Magnus Lööf <magnus.loof@basalt.se> Change-Id: I77613bbeb19d89e6a25e52f24f3275d309ceb032
2017-02-17Use install-pip macro in most source imagesChao Guo1-1/+9
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-01-18Fix barbican dockerfilezhubingbing1-2/+2
remove avoid /var/log/barbican Change-Id: I07fb4551c7497102e291b658efeba38109e91253
2017-01-17use static uid/gid in imagesSam Yaple1-5/+5
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
2016-11-03Remove Fedora supportChristian Berendt4-5/+5
Closes-bug: #1616387 Change-Id: Id97f88b9baa3d48d33ce120962450a374282d044
2016-10-11Add missing uwsgi for barbican-api Dockerfileliyingjun1-1/+4
uwsgi is not installed for barbican-api in ubuntu. Change-Id: Ibaaf7eb9dfae2f88a5a2d9c3b4983d403e52c932 Closes-bug: #1632170
2016-09-13Add header blocks to all DockerfilesPaul Bourke4-0/+8
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-09-05Add Barbican container dockerfilezhubingbing7-0/+131
Partially-Implements: blueprint barbican-container Change-Id: I2c4d5df1b35be95f75413067efacc0b401e7ce08
2015-05-15Restructure builds to allow more flexibilitySam Yaple3-122/+0
As a restructure, nothing is changed from the original behaviour and naming despite the file structure changing. The symlinks to build had to be updated generating lots of "deleted" and "new_file". The new structure is: docker/${base_distro}/${type}/${container} base_distro == centos, ubuntu, fedora, etc type == source, binary, rdo type rdo is a symlink to binary for backwards compatibility Two new flags are added to the build-all script to support the ability to support different base distros and a flag to support binary or source containers. There are several added folders that are empty to hold the directory structure for future containers of these types. To use a prefix other than centos-rdo- you can set PREFIX in the toplevel directory .buildconf file Change-Id: Ifc7bac0d827470f506c8b5c004a833da9ce13b90
2015-05-11Fix image build for barbicanJeff Peeler1-1/+3
tar package was missing Change-Id: Ic932455fe341cdb7acfe79c53a450071d1d2b1b6
2015-05-06Port to icehouseSteven Dake1-1/+1
This represents making build-docker-images --release build with the icehouse tag and causes docker-compsoe to pull from the icehouse tag. Partially-implements: blueprint port-kilo Change-Id: I66b2c39abc55c0f47152dd90e696fc46b9c58f50
2015-04-06Remove EXPOSE options from DockerfilesSteven Dake1-3/+0
The EXPOSE options will create a local docker-proxy. This is unnecessary with --net=host mode. The docker-proxy adds about 20 microseconds of latency. Add documentation to the specification to indicate where to find the ports that are exposed by the services in case someone were to desire to add EXPOSE back to the Dockerfiles. Change-Id: I398e922fe096d6022a2d5985bb92498f89a5ea31
2015-04-01Allow check_for_* functions to be consumed by wait_forMartin André1-2/+2
In order for the `check_for_*` functions to be consumed by `wait_for`, they should notify of their success but not exit. As a consequence, the previous behavior is restored by the fail_unless_* companion functions. With this change, it is now possible to do: wait_for 30 1 check_for_os_service_running keystone Change-Id: I16ddf8913027030c3ccb5487713d172904508fd6
2015-03-27Replace ; with && in DockerfileSam Yaple1-1/+1
When using ';' this can allow the previous command to fail and while the docker build proceeds without realizing a command failed. Switching to '&&' allows the exit code to make it to the docker build command and the build to fail appropriately. Change-Id: Idd0991ed4549542bb10d27da1a0a025d0503b6c1
2015-03-02Allow changing base imageMartin André1-1/+1
By changing the PREFIX variable in the .buildconf one is now able to build docker images from different bases. For example, add the following line to your .buildconf file to build CentOS based images: PREFIX=centos-rdo- Default base image is Fedora. For now only RH family is supported. Additionally, changing the namespace either with the NAMESPACE variable in .buildconf or via --namespace commandline option now changes the source namespace as well from the default kollaglue one. Implements: blueprint multi-baseos Co-Authored-By: Steven Dake <stdake@cisco.com> Change-Id: I3964cd2292789ea883a1f2d2738a5731a4fff49b
2015-01-19Cleanup required variables checks for all containersMartin André1-10/+5
This allows Kubernetes to reschedule containers in case a required variable is missing, for example when the Kubernetes pod is started before the service. The checks were cleaned using the following method: * remove duplicates * remove check for variables that get a default value in the same file * check for all variables used in the file * check for required services when it is obvious. Change-Id: Ib7e0530c410c61f828d36efe8925a20dc9781eab
2014-11-07Containerizing barbican serviceVenkat Sundaram3-0/+128
Adding Dockerfile, pod and service. Please note that this uses the Juno version of Barbican from tar ball and uses uwsgi to run the service. Addressed review comments and added admin service as well. Fixing Maintainer email and yum clean up Change-Id: If58c5eec00131582024045f8d213e48f9f466f4d