summaryrefslogtreecommitdiff
path: root/docker/murano
AgeCommit message (Collapse)AuthorFilesLines
2019-01-17Use base_package_typeAlex Schultz3-6/+6
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-12-05Add the missing murano package files ↵chenxing1-2/+4
When enable Murano, kolla-ansible will import the io.murano.applications.zip file[1]. But Murano container doesn't symlink this file. This patch is to add the missing link. [1] https://github.com/openstack/kolla-ansible/blob/master/ansible/roles/murano/tasks/start.yml#L69 Change-Id: Id791fc39e1f5136add7d10db291cbdba59d1c291 Closes-Bug: #1734019
2017-10-23Create murano applications package for importJames McCarthy1-1/+3
Similar to the murano core library package, adding in the creation of the io.murano.applications package to allow it to be imported. Change-Id: I1c0778fe348893b12180882e48fcc918d09ef47d
2017-05-03Override image's meta info.Jawon Choo3-3/+3
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.j2Chen3-3/+3
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 Juszkiewicz3-3/+3
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 Zhang2-2/+0
include_header and include_footer parameter is already removed, remove them in all Dockerfiles. Add missing footer block. Change-Id: I90da03eb9f95a3827361d5f5ede65fde7d6be2b3
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
2017-01-05Remove footer block and variable in *-base imagesJeffrey Zhang1-1/+0
Change-Id: I39aa88489f744f779150695f3f55ef80d42e1c61 Closes-Bug: #1653247
2016-11-03Remove Fedora supportChristian Berendt3-3/+3
Closes-bug: #1616387 Change-Id: Id97f88b9baa3d48d33ce120962450a374282d044
2016-09-13Add header blocks to all DockerfilesPaul Bourke3-0/+7
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-31Merge "Import the Murano core libary as part of setup"Jenkins2-1/+5
2016-08-29Change source with dot at extend_start filesEduardo Gonzalez1-1/+1
Is a best practice in Unix/Linux scripts to use dots instead of source command. Using dots will avoid issues with non BASH shells TrivialFix Change-Id: Ie6480a1954f853f79faffa093452715ebd9f7d90 Signed-off-by: Eduardo Gonzalez <dabarren@gmail.com>
2016-08-25Import the Murano core libary as part of setupPaul Bourke2-1/+5
In order for Murano to be operational the core library package must be imported [0] Add Ansible tasks to do this idempotently. [0] http://docs.openstack.org/developer/murano/install/manual.html TrivialFix Change-Id: I2c49e9d663595650b885267839012b543505337a
2016-08-19Handle empty package list for install_packagesShaun Smekel3-3/+3
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-18Customizations for muranoSwapnil Kulkarni (coolsvap)3-27/+25
This patchset contains customization of Dockerfiles of murano containers Change-Id: I5443c76627d700652a883409dce34a1511f50728 Partially-implements: blueprint third-party-plugin-support
2016-05-27Merge "Add support for murano binary containers for rpm based distros"Jenkins3-8/+21
2016-05-26Update ubuntu dockerfiles for formattingSwapnil Kulkarni (coolsvap)3-3/+3
Change-Id: If4be00b937e14ec93443dcb7249cf17099d57cbe Closes-Bug: #1569417
2016-05-25Add support for murano binary containers for rpm based distrosSwapnil Kulkarni (coolsvap)3-8/+21
Change-Id: I0b916d238f28fe1b536abfb01228b24dbabe8b91 Depends-On: If4be00b937e14ec93443dcb7249cf17099d57cbe Closes-Bug:#1582537
2016-02-24Remove duplicate code in murano extend_start.shÉric Lemoine4-10/+6
Change-Id: I32e55ce520c95b3d2c018604e925bd8d4fdf58f1 Partial-Bug: #1546944
2016-02-19Make Heka collect Murano logsÉric Lemoine3-3/+21
Partially implements: blueprint heka Change-Id: I17fc4b838d6ba8b6fcfc5c08314fef5fac1c7aff
2016-01-14Murano ubuntu binary containerArtur Zarzycki3-0/+28
Change-Id: I059565c15f5b820c5944d5bd349ccbc5acdb7540 Partially-Implements: blueprint binary-ubuntu
2015-12-27Fix pip install settingsSamYaple1-1/+1
There were some inconsistencies with pip install instructions thoughout Kolla. We fix those here. Additionally, we fix the virtualenv to properly use the site-packages on the host if a library is not available in the venv. Change-Id: Ib84d48e8826bb96060338b3fa0782620c98794a8 Related-Bug: #1524684 Closes-Bug: #1529434
2015-12-27Add missing contraintsSamYaple1-1/+1
There were some missing constraint caps on our pip installs TrivialFix Change-Id: I3d0af9556d08a9a0a99248a9992637d08fd3ad01
2015-12-15Fast fail unsupported murano-base install typesMartin André1-1/+6
The centos-binary murano image will still fail to build, but at least it will fail with a relevant error message. Change-Id: I9870f3437fbfad5820eb014173d9ec49813e60d0 Closes-Bug: #1526202
2015-11-30Drop root for muranoSwapnil Kulkarni (coolsvap)4-1/+7
Updates to ensure commands run in the murano containers are done as the 'murano' user rather than root. Change-Id: I558c46b032f11b83a9dc6b5abc158aa6d24ec0eb Partially-Implements: blueprint drop-root
2015-11-27Source installation in virtualenvMichal Rostecki1-1/+1
Use virtualenv for installation of OpenStack projects and dependencies to avoid conflicts with Python libraries installed by non-OpenStack binary packages. Change-Id: I21ecd673b2e93335b1d3dd4e279e940c9d694c3c Implements: blueprint virtualenv
2015-11-23Remove hardcoded MAINTAINER in DockerfilesSwapnil Kulkarni (coolsvap)3-3/+3
Added new option in kolla-build.conf Change-Id: I45fe51966bcb59ea19d112281ba3d5a1ba091a56 Closes-Bug:#1514304
2015-10-13Fix issue with su and bad kernelsSam Yaple1-1/+1
Long story short, some kernels before 3.15 had an issue with using su in a container when the network namespace was --net=host. The gate has a 3.10 and a 3.13 kernel and has a problem with this. This changes everything to use sudo backport: liberty Partially-Implements: blueprint functional-testing-gate Change-Id: I4d79ccaa1cddffcc8393f64e7e1be2538efe33e5
2015-10-06Common start.shSam Yaple4-20/+2
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"Jenkins3-3/+3
2015-09-28Merge "remove set_configs"Jenkins2-8/+0
2015-09-28Implement a install_type and install_metatypeSteven Dake3-3/+3
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 Yaple2-8/+0
Change-Id: I9bb0a1fac63cc326234b0f06b1e56b43e0753279 Partially-Implements: blueprint replace-config-external
2015-09-27Remove all fail sections for UbuntuSam Yaple1-6/+1
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
2015-09-25Fix removal of config-externalSam Yaple2-2/+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 Yaple2-20/+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 - muranoSam Yaple2-12/+8
Change-Id: I8c5fdb2f2d3284960318a8189c4cc5bd6a8e59e9 Partially-Implements: blueprint replace-config-external
2015-09-07Merge "Add ansible support for Murano"Jenkins2-2/+2
2015-09-07Add ansible support for MuranoMick Thompson2-2/+2
Deploy the core services for murano-api and murano-engine containers. Implements: bp ansible-murano Change-Id: Ibcc618665a3509465ba8f9249a417e8848087eef
2015-09-04Merge "Allow arbitrary source archive name to be imported into Dockerfile"Jenkins1-2/+2
2015-09-03Allow arbitrary source archive name to be imported into DockerfileVladislav Belogrudov1-2/+2
Currently we cannot import source archives with names different than expected by hardcoded line in Dockerfiles. This worked well for Openstack services' tarballs where we expected SERVICE-* root folder after extraction or kanaka-noVNC for nova-novncproxy docker. The latter fails if one tries to clone or get tarball under other names. This fix allows any archive (tar,tgz,zip) or repo name to be imported into dockerfile. Change-Id: I869a6a19afaf0e93925572746c22b7589b6600c9 Closes-Bug: #1491415
2015-09-03Create openstack-base containerSam Yaple1-1/+1
This creates and moves the dependencies for Ubuntu into a common openstack-base container. This commit shows dramatically smaller sizes for all non-openstack containers. The Openstack container remain the same size. Change-Id: I2f46420d4b9edcfddda374caddcce906fc708f6c Partially-Implements: blueprint openstack-common-container
2015-08-31Remove dest_filename from build.iniSam Yaple1-1/+1
We can, and should, figure out the filename dynamically rather than hardcode that value in build.ini since it is not actually a configurable paramater. Change-Id: I496d6555e9fa356ab09e62063fd707f43ed08121 Closes-Bug: #1490386
2015-08-28Move docker_templates to docker dirSam Yaple7-0/+90
Updated build.py to reflect this change. Deprecate --template option and make it a noop. Change-Id: I7cd98d1ee684a4c64984a49597159868152683b2 Partially-Implements: blueprint remove-docker-dir