aboutsummaryrefslogtreecommitdiff
path: root/docker/base/Dockerfile.j2
AgeCommit message (Collapse)AuthorFilesLines
2016-04-12Merge "Adds iscsid and tgtd docker containers"Jenkins1-0/+9
2016-04-11Identify container through PS1 shell variableCarlos Cesario1-0/+16
As suggested it was created the variable KOLLA_SERVICE_NAME to identify the container service name through PS1 shell variable. This method it was previously discussed in IRC. https://goo.gl/k7AdEg The other option it was usage hostname param in kolla_docker, but currently docker does not support it due this issue: https://github.com/docker/compose/issues/2460 The final result is like this: $ docker exec -it heka /bin/bash (heka)[heka@kolla-control /]$ $ docker exec -it mariadb /bin/bash (mariadb)[mysql@kolla-control /]$ More details can be accessed through this link http://paste.openstack.org/show/493689/ Closes-Bug: #1557454 Change-Id: I6aab8d640a8ebb17baa9d6d4f1edd6e331674713
2016-04-10Adds iscsid and tgtd docker containersSerguei Bezverkhi1-0/+9
This partially implements iscsi and lvm2 support for cinder in Kolla. Adds iscsid and tgtd docker containers. Change-Id: I7fb48c954e578772b90a2aa619c8bcfa990b3ae8 Partially-Implements: blueprint iscsi-lvm2-docker
2016-03-18Install Elasticsearch and Kibana packages using yum/apt-getVikram Hosakote1-0/+3
Test results of this patch set are at http://paste.openstack.org/show/490450/. Change-Id: I2957cc70fcca34706ec50a630d785f0630c3f5c0 Closes-Bug: #1553203
2016-03-15Add missing tar command for oraclelinux binaryPaul Bourke1-0/+1
Kibana was failing with the binary build type due to tar missing. TrivialFix Change-Id: Ia7cb77c5359b2ed30cd1883c0848cd1506a63833
2016-03-10Merge "Add missing 'yum clean all' in oraclelinux base"Jenkins1-1/+2
2016-03-10Add missing 'yum clean all' in oraclelinux basePaul Bourke1-1/+2
This one line halfs the size of oraclelinux images, from over 1GB to just over 500MB, bringing them inline with centos. TrivialFix Change-Id: I9fd89aeeec56207791fc289db9880b43b17536f5
2016-03-09Add centos-extras repo to oraclelinux-basePaul Bourke1-0/+1
magnum requires python-docker-py which is missing in the oraclelinux base repos. TrivialFix Change-Id: I466a170a8df8f207c47d06ba5a6cba9b7efa3e5f
2016-02-13Added Elasticearch and its deployment.akwasniewska1-1/+5
Part of ELK stack. Includes Dockerfiles for both Centos and Ubuntu. Change-Id: I9f76adf084cd4f68e29326112b76ffd02b5adada Partially-implements: blueprint central-logging-service
2016-02-04Move the install base type check to kolla-buildAllen Gao1-22/+0
The install type is converted in kolla-build, so it will never fail in dockerfile, move the check to kolla-build just above the install type converting. TrivialFix Co-Authored-By: Jeffrey Zhang <jeffrey.zhang@99cloud.net> Change-Id: I1500d3b47e909f94ea9f68c5245297733f63a70b
2016-01-26Add ca-certificates to required packages.akwasniewska1-0/+1
Using curl with https requires ca-certificates. TrivialFix Change-Id: Idcb78233fcc07fd3d5491e230ed78efc4f9b949f
2016-01-25Update keyserver for ubuntuSamYaple1-4/+4
Our other keyservers for ubuntu use port 80 for firewall reasons. Update the base to do the same. TrivialFix Change-Id: I4f6e59b3925e49a389e0415c943862cc13422f95
2016-01-20use http instead of https for getting mariadb keyAllen Gao1-1/+1
yum.mariadb.org intermittent ssl certificate ca bundle has problem for now. https://mariadb.atlassian.net/browse/MDEV-9435 Change-Id: Ic0dd72c4586958224c03572ca9de0ea15a7a38fd Closes-Bug: #1536066
2016-01-13Merge "Ceph repo has been moved to download.ceph.org"Jenkins1-1/+1
2016-01-13Ceph repo has been moved to download.ceph.orgJeffrey Zhang1-1/+1
Ceph has move it repo to download.ceph.org[0]. Actually, http://ceph.com/rpm-hammer return a http 301 code now. [0] http://docs.ceph.com/docs/master/install/get-packages/#add-ceph TrivalFix Change-Id: I304f9e231c32f63e13d4a5b889412799c39f4d7e
2016-01-11Fix missing jinja2 in source images for mesosPaul Bourke1-0/+1
The base image is missing python-jinja2 for source builds which causes the kolla_mesos_start script to fail on import. Change-Id: I8550115dd42f4401a3351cd7c466fbeb1e02a665 Closes-Bug: #1532275
2015-12-30Base and openstack-base ubuntu binary containers.Artur Zarzycki1-1/+1
Change-Id: I93d7f4227f6b4ac04e1af5afd5e46bdbaba84b4f Partially-Implements: blueprint binary-ubuntu
2015-12-25Merge "import the gpg public key properly"Jenkins1-3/+5
2015-12-24import the gpg public key properlyJeffrey Zhang1-3/+5
include: * CentOS 7 RPM GPG key * Percona repo GPG key * OpenStack Magnum repo GPG key Closes-Bug: #1528988 Change-Id: I2419d1d130c2cc4466e884e4022b64d81109943b
2015-12-24Make the yum repositories configurable in the base imageDavid Moreau Simard1-3/+3
- Removed hardcoded yum repository configuration in favor of commands dynamically generated based on repo-url and repo-file arguments. We maintain a sane default set of repositories. - Added generic rpm_setup_config parameter to add support for installing .rpm or .repo files before building containers. Co-Authored-By: Ryan Hallisey <rhallise@redhat.com> Implements: blueprint custom-repos Change-Id: I1b3a7647a9e7239de3cd162cb6f464f05632bde1
2015-12-17Add kolla version to base containerMichal Jastrzebski1-0/+2
We want to record kolla version of running containers to be able to detect whether or not we need to perform certain downtime-causing actions during upgrade. Change-Id: Ie113029da98303e6809d56edbf6d8de37be128d7 Implements: blueprint record-version
2015-12-16import the rpm gpg keyJeffrey Zhang1-0/+6
this will purge the package pgp key warning Closes-Bug: #1525276 Change-Id: I956c8b0b6f1e1bfbceaa6abc06da16a980f023c1
2015-12-16do not replace the systemd-container with systemdJeffrey Zhang1-4/+1
Systemd-container no longer exist in centos latest docker image. Change-Id: Icbfc7fce99885551f7f4caa707a600b20db849ae Closes-Bug: #1526606
2015-12-15Merge "Do not purge yum-plugin-fastestmirror package"Jenkins1-1/+0
2015-12-12Do not purge yum-plugin-fastestmirror packageJeffrey Zhang1-1/+0
It will be helpful for speed up the package installation. Closes-Bug: #1525514 Change-Id: Id40a0afa30dd0a142bee3b13f7622cb0d42d9298
2015-12-11add python-kazoo and python-six when using centos source install typeJeffrey Zhang1-0/+2
Closes-Bug: #1525055 Change-Id: Id800da1a0cce4db20c32e8daf09c5f0f2c9f8929
2015-12-07Add Python 3.x support in set_configs.pyMichal Rostecki1-0/+2
Change-Id: I348c69e5411135da8434e9278a48a5777ff2a72d Partially-Implements: blueprint python3
2015-12-04Merge "Add support for copying files from a "zk://" source"Jenkins1-0/+5
2015-12-02Remove the meaningless comment line in base image DockerfileJeffrey Zhang1-10/+10
Use jinja2 comment syntax instead. Closes-Bug: #1521932 Change-Id: Ida5a9204e7affe880ac6156d3fed3206b1eae7b9
2015-12-02Add support for copying files from a "zk://" sourceAngus Salkeld1-0/+5
Co-Authored-By: Michal Rostecki <mrostecki@mirantis.com> Implements: blueprint zookeeper Change-Id: I176f063d3802716846b921e210c1569d28bd90d8
2015-11-30Fix the confused comment in the base image DockerfileJeffrey Zhang1-1/+1
Use jinja2 comment syntax instead. Closes-Bug: #1521078 Change-Id: I261f7bdd9e1286b4ad71fc4529228449ffe21af2
2015-11-27Install yum-plugin-priorities on RHEL-derivativesDavid Moreau Simard1-1/+4
RDO provides all of the OpenStack services, clients, libs and their dependencies self-contained in it's repositories. We have had users that were impacted by sudden updates from EPEL when it was enabled because EPEL provided a more up-to-date version. Packages may also be found in both the delorean and delorean-deps repositories. yum-plugin-priorities will ensure the right package candidates are chosen for installation. Change-Id: I043ec1f60381dc7f5baab5f320ed5f1edde8ae82 Related-bug: https://bugzilla.redhat.com/show_bug.cgi?id=1284978 Closes-bug: #1520620
2015-11-24Pin specific version of CephMichal Rostecki1-0/+8
Change-Id: Ie358064b507729b9606683ce1a0e8feac7646030 Implements: blueprint pin-ceph
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-09Base image changes for drop-rootSteven Dake1-1/+4
The reason we are doing drop root is so that a network exposed software component (i.e. glance) cannot be used to affect the immutability of the container which it runs in. I have tried several different approaches and this is the only approach which puts glance in PID=1 while ensuring no files may be written by the glance process in the container image except for the log files. Change-Id: Ifd3c8c361b78d0e4791dade3afa6435290407c41 Partially-Implements: blueprint drop-root
2015-11-06Switch to RDO untested master repositoryDavid Moreau Simard1-1/+1
RDO does not yet provide a CI tested Mitaka repository. As such, the current-passed-ci repository is the last tested repository before the stable/liberty branch was cut. To be able to test against the latest packages, we need to use the untested repositories until the CI tested repository is in place. TrivialFix Change-Id: I4a125eb3c84fa790746a9a8eca19e4fb2d9ecf38
2015-11-04Fix RHEL buildsRyan Hallisey1-4/+4
Register with RHEL on the host machine and use yum to setup the repos in the container. Change-Id: I38aaf43fffaf7a235e69b330d5d9f0f1be31fe83 Backport: Liberty Closes-Bug: #1513088
2015-11-03Download, install, and enable rabbitmq_clusterSam Yaple1-1/+3
Change-Id: I84d7587fca64dc8a9f05e326a27511ded79e902d Partially-Implements: blueprint rabbitmq-clusterer
2015-10-23Use EL7 repostitory instead of EL6 for perconaSteven Dake1-2/+1
This patch uses the EL7 binary bits for percona's software instead of EL6. To match binary ABIs, it is recommended to use the same major version of EL for CentOS. backport: liberty Change-Id: I1d2b146a036806c7fd2baef97a6ed861a570d26e Partial-Fix: #1509281
2015-10-21Improve dry-ness of base dockerfile.j2Steven Dake1-13/+3
The delorean repositories no longer have a separate location for openvswitch. Now openvswitch is located in delorean-deps.repo and the rest of delorean master is located in the delorean.repo file. These files can be installed for both RDO and SOURCE, but not for RHOS. This patch uses the install_metatype to make a determination as to when to install these two repos. In the process, we can remove the source RPM installation. Change-Id: Ieedddd9d7ee234b6acdb03f7043d57c18e024951 Closes-Bug: #1508326
2015-10-13Make Ceph work for RPM based distributionsSteven Dake1-0/+2
Ceph packages need to be installed in nova, glance, and cinder. Once that is done, Ceph works like a champ! Change-Id: I296da1d04d0c1bcb729f22e65e432d53d561b49c backport: liberty Closes-Bug: #1505549
2015-10-08Merge "Remove debug output in base image yum command"Jenkins1-1/+1
2015-10-06Enable source for openstack-base for RPM distrosSteven Dake1-19/+3
Make openstack-base optimized for from source builds for RPM based distributions. backport: liberty Change-Id: I5f1056ebc09fd55cd5d46da7a09331e38940d888 Implements: blueprint openstack-common-container
2015-10-06Remove debug output in base image yum commandSteven Dake1-1/+1
The base image contains -d 10 in a yum command which prints unhelpful debug output for one of the yum commands. Remove the extranous debug output. backport: liberty TrivialFix This patch is a trivial fix and is a test to set boundaries on what a trivial fix looks like that doesn't require a bug tracker entry. If reviewers feel a trivial fix isn't documented properly by this commit message, please weigh in, as this is a slight suggested change to our policy as first institued by the Magnum community and brought to my attention by Jeff Peeler. Hopefully this compromise won't be abused :) Change-Id: I57f00978d0baaefd73592f4ad6a655e663d83478
2015-10-06Bring Kolla inline with FHSSam Yaple1-3/+2
This brings Kolla images inline with FHS and should make finding locations of things more consistent and reliable with the linux world at large. Change-Id: Iece5b4da4bace0fb8b1f41a65ab2c852ec73e6f8 Closes-Bug: #1485742
2015-10-06Common start.shSam Yaple1-1/+7
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-29Make a openstack-common container for CentOS variantsSteven Dake1-82/+0
Only implements CentOS (RPM family) binary in openstack-common. Change-Id: I5249d0ffaf4c0c946ee2347d5519391ded160cea Partially Implments: blueprint openstack-common-container
2015-09-28Significant refactor of base imageSteven Dake1-28/+59
This refactor organizes the code as follows: If RPM family: execute YUM repo setup if binary install binary tools if source install source tools IF DEB family: install source tools I have tested building and everything seems fairly solid except possilby RHOS. The long term goal of this patch is to allow us to add our own repos in the "execute YUM repo setup" section of the base file based upon OpenStack Infrastructure YUM repos. Partially-Implements: blueprint rhel-based-image-support Change-Id: I759fb8fc050973460c9c69bb500de68e88a68b3b
2015-09-28Implement a install_type and install_metatypeSteven Dake1-0/+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 all fail sections for UbuntuSam Yaple1-0/+23
Ubuntu binary is not supported and may never be. Installing from cloud-archive packaging is only for the current stable distros, Ubuntu does not have a Delorean type repo. We place a fail message in the base image to catch this and remove the messages throughout the project. An additional fail message is placed to catch all other things. Change-Id: Id2953f503ebd42226f6a08e75979ae56511c40f7 Implements: blueprint install-from-ubuntu