aboutsummaryrefslogtreecommitdiff
path: root/docker/base
AgeCommit message (Collapse)AuthorFilesLines
2017-01-24Update dumb-init to version 1.2.0Bertrand Lallau1-1/+1
Change-Id: I896140375530f6c3a0ed8adc8a9632d36a8d359d
2017-01-23Merge "Fix the set config error"Jenkins1-101/+169
2017-01-20Add block for dumb-init installationEdmund Rhudy1-3/+7
This moves the dumb-init installation to its own RUN command in a separate block so that it can be overridden for Internet-disconnected builds. Change-Id: Ice1d6b086db85d2c2b364518b26eb819e92e1d4f Closes-Bug: #1657583
2017-01-18Merge "Add blocks for Ubuntu apt setup and package installation"Jenkins1-7/+17
2017-01-18Fix the set config errorJeffrey Zhang1-101/+169
* fix wrong handle for directory * refactor the code Closes-Bug: #1563741 Change-Id: I83869e074cb2924f1c5b49a67e57aefef623a8b0
2017-01-17Add blocks for Ubuntu apt setup and package installationEdmund Rhudy1-7/+17
This adds additional blocks in the base image dockerfile to enable overriding additional sections, as well as doing so in a more fine-grained manner. The main use case here is being able to do Internet-isolated builds of Ubuntu-based Docker images. Change-Id: I9842895a898f6798becc6177aabdf8deffead611 Closes-Bug: #1656069
2017-01-17use static uid/gid in imagesSam Yaple1-1/+9
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-17Install epel-release-latest rather than certain versionJeffrey Zhang1-2/+2
Install epel-release-latest from fedoraproject.org Change-Id: Ifb667aaf5184346be70647d9c7574833f526a3cf Closes-Bug: #1656733
2017-01-11Fix string formatting on error logFlavio Percoco1-1/+1
The missing parenthesys caused a string formatting error, which hides the actual failure when running the container. Change-Id: Ieebf4abd536ccfceeba645c52b109b00faf4ee57
2017-01-02Enable zookeeper for CentOS/OracleLinuxSteven Dake2-1/+12
Change-Id: I5e0e3afc18cba63ea0c9b7d8a9ae32ae8a774ba1 Partially-Implements: blueprint monasca-containers
2016-12-28Merge "Removed percona from ubuntu repos"Jenkins2-10/+11
2016-12-23Merge "Readability improvement to base image"Jenkins1-13/+33
2016-12-20Removed percona from ubuntu reposSam Yaple2-10/+11
16.04 provides the percona-xtrabackup scripts in the main repos, so the specific percona repo can be removed. Unfortunately, mariadb10.0 does not build with galera built-in. So until ubuntu packages mariadb10.1, we will be dependant on the external repos for mariadb with galera built in. Labels keys so they are easily identified in the future. In Jinja2 the comments cannot go inline while generating the list. Change-Id: I5e6c2f884c8d59bbc574b71ac731d1b4db18b68c
2016-12-20Readability improvement to base imageChao Guo1-13/+33
Improve the dockerfile readability, eliminate some long lines. Change-Id: Ia8fc3478950855e1867dd30fa2fc47b8e3df22f8
2016-12-18Remove /usr/bin/install from allowed commandsSam Yaple1-1/+1
This essentially allows the user to copy any files and set any ownership on any files. Can be used to do anything on the system and all users in 'kolla' group have access to it. Change-Id: I9d6cd2b4ca40cb536484fa45e80692105b5fa2a4
2016-12-11Fix some typopangliye1-1/+1
Co-Authored-By: caoyuan <cao.yuan@99cloud.net> TrivialFix Change-Id: Ie576114a3f6f4579a4df3175232a5f6c63c7a795
2016-12-01Consistently use a exception vs sys.exitJoshua Harlow1-38/+79
This also makes it so that the config check accumulates errors instead of bailing out immediatly (using a sys.exit) which seems nicer than blowing up on the first error. Change-Id: I915ef5a018969eee87ac1ab3ddc88fc1b89a3448
2016-11-28Bump Ubuntu cloud-archive repo to OcataJeffrey Zhang1-2/+2
Change-Id: I9e810dc16482a749ab5b81b506fe45e14fe88a26
2016-11-22Update Percona repo to current releaseportdirect1-1/+1
The Percona Repo was updated on the 14th November to version 0.1-4 this commit updates rpm based builds to reflect that change. Closes-Bug: #1643867 Change-Id: I5787943bb2bc11408ca8e8cdd6d1997cbc8919f1
2016-11-15Allow for specifying a KOLLA_CONFIG_FILEJoshua Harlow1-1/+3
Incases where it is useful to place many config.json files under the same directory (ie one for config_glance_api.json or one for config_glance_registry.json) we should be able to specify which file under that directory do we actually want to use (instead of assuming it is always config.json). Change-Id: I42eeb093d29bac27d71ee08e55e115c2d8b5e9ae
2016-11-06remove override_install_langs option in /etc/yum.confjiangpch1-1/+2
Closes-Bug: #1637803 Change-Id: I5c22b76379b1dce1673124ac8b46b894449405a5
2016-11-03Remove Fedora supportChristian Berendt1-16/+3
Closes-bug: #1616387 Change-Id: Id97f88b9baa3d48d33ce120962450a374282d044
2016-11-02Merge "Revert "Move RDO to Newton branches""Jenkins1-4/+1
2016-11-02Revert "Move RDO to Newton branches"Steven Dake1-4/+1
Revert note: Get RDO back on master instead of the newton branch This reverts commit aeb86de6fc644a514d060b4ac869cab364266f03. Change-Id: I765ba60c3bd09fe3978570b7921a084c9b90c7d0
2016-10-19Add blocks to customize RHEL package installationAndrew Widdersheim1-0/+2
Add blocks to the base Docker image that allows the operator to override the base RHEL package installation. TrivialFix Change-Id: If570975e1f57ef9820544174dacc3f13d09bb215
2016-10-18Fix mariadb build issueMichal (inc0) Jastrzebski1-0/+1
Change-Id: I12cb9a000f2d90007c1ea55d1ca12ede28c35d6f Closes-Bug: #1634680
2016-10-17Merge "move sys.exit out of try finally block in set_config.py file"Jenkins1-2/+1
2016-10-16Remove ceph repo for Ubuntu installJeffrey Zhang4-12/+0
Ubuntu cloud archive provides ceph jewel now. Remove ceph official repo for the wrong dependency when installing ceph. Change-Id: I5be6b18c4250733ed9ab4f526fcdc45eb84f8342 Closes-Bug: #1633888
2016-10-14move sys.exit out of try finally block in set_config.py fileJeffrey Zhang1-2/+1
when code exit by using sys.exit in try..catch block, it will skip catch and run the code in finally. Because SystemExit does not inherit from Exception. This patch moves sys.exit out of finally block. Then it won't execute when script exits by sys.exit Change-Id: I6457b1b861d2f9fdadce788ac6b719f46c7f2af3 Partial-Bug: #1631503
2016-10-13Fix rabbitmq upgrade permission issueJeffrey Zhang1-3/+47
During the upgrade from Mitaka to Newton, the uid/gid may change for the same image. Especially on Ubuntu, we moved to Ubuntu Xenial in Newton and it added systemd related user which break all the uid/gid during an upgrade. It will the permissions in all docker named volumes. This fix extends set_config.py to set the proper permission during container start. This is super light then add commands in extend_start.sh file or add ansible tasks. This patch just fixes rabbitmq case. Other services will be fixed in following patches. Partial-Bug: #1631503 Change-Id: Ib17027b97abbc9bf4e3cd503601b8010325b5c5b
2016-10-07Move RDO to Newton branchesSteven Dake1-1/+4
RDO Newton is available. Lets use it and test with it this final week. TrivialFix Change-Id: I2a761366da7c2cf209adaceb73ac7fa9c9aa3cba
2016-09-22Merge "Fix permission for /var/log/kolla folder"Jenkins1-0/+3
2016-09-22Fix permission for /var/log/kolla folderJeffrey Zhang1-0/+3
Docker will change the name volume folder permission to image already set. /var/log/kolla is not created and well configured in image. This patch set creates and configures proper permission /var/log/kolla in base image. This patch set also fixed the ceph image by adding ceph user to kolla group. TrivialFix Change-Id: Ib5ef0187e90de2699b3cda31e819b4babb07e0af
2016-09-21Merge "Fix base CentOS repository keys"Jenkins1-2/+1
2016-09-20Fix base CentOS repository keysJiri Stransky1-2/+1
Fix typo in variable name ("yup" instead of "yum"), which means we now import the repo keys we intended to. Furthermore we no longer try to import EPEL key in that very spot, as it should be imported after epel-release is installed, which already happens later during the base image build. CentOS/EPEL keys in the image before this patch: ()[root@6843e7e136cf ~]# rpm -q gpg-pubkey --qf '%{summary}\n' | grep -i -E '(centos)|(epel)' gpg(CentOS-7 Key (CentOS 7 Official Signing Key) <security@centos.org>) gpg(Fedora EPEL (7) <epel@fedoraproject.org>) With this patch: ()[root@64a6ae7d0347 ~]# rpm -q gpg-pubkey --qf '%{summary}\n' | grep -i -E '(centos)|(epel)' gpg(CentOS-7 Key (CentOS 7 Official Signing Key) <security@centos.org>) gpg(CentOS Storage SIG (http://wiki.centos.org/SpecialInterestGroup/Storage) <security@centos.org>) gpg(CentOS Virtualization SIG (http://wiki.centos.org/SpecialInterestGroup/Virtualization) <security@centos.org>) gpg(Fedora EPEL (7) <epel@fedoraproject.org>) Change-Id: I5cd22a887282e5de199a809b0798a439ce1a99e7 Closes-Bug: #1625585
2016-09-19Update EPEL version in baseAndrew Widdersheim1-2/+2
Update to epel-release 7-6. Also, move from HTTPS to HTTP in the RHEL builds to match what is happening in Oracle Linux. Seems as though HTTPS does not work any longer. TrivialFix Change-Id: Icc457a333acdd5cc5b1e124d4308c4af1eb8d2cc
2016-09-15Merge "Bump version of Kibana from 4.4 to 4.6"Jenkins3-5/+5
2016-09-15Bump version of Kibana from 4.4 to 4.6Christian Berendt3-5/+5
TrivialFix Change-Id: Ia18cb89e0951359226add5cbd96d3a91c7fcfd8a
2016-09-13Merge "Install apt-utils in Ubuntu base image"Jenkins1-0/+1
2016-09-13Merge "Fix wrong release name in a comment in sources.list.ubuntu"Jenkins1-1/+1
2016-09-13Fix wrong release name in a comment in sources.list.ubuntuChristian Berendt1-1/+1
TrivialFix Change-Id: If74270337a5d9829784ee3e28d4f994a6fd845db
2016-09-13Add missing apt-get clean in Ubuntu base imageChristian Berendt1-1/+3
TrivialFix Change-Id: Ibd4ba9dbe2cadb304e027b60d5b7378416719d12
2016-09-13Install apt-utils in Ubuntu base imageChristian Berendt1-0/+1
Change-Id: I5b96dc0e8debd718bb61b3bd9c1c2028af004a1c Closes-bug: #1622777
2016-09-12Added grafana containerMathias Ewald4-2/+20
Added grafana repository to base image Co-Authored-By: zhubingbing <zhubingbing10@gmail.com> Installed grafana from repository Change-Id: Ib99195ec4522f185f6fd4cebf10e305bb58f69c4 Partially-Implements: Blueprint performance-monitoring
2016-09-09Change ceph version to JewelMichal (inc0) Jastrzebski4-25/+5
This patch changes version of ceph from hammer to jewel. Also removed versionlock as it seems we don't use it in ubuntu, and actually might be risky if we miss security patch on ceph. Change-Id: Ib8f88c2f914a4b635e59a509fa0194605eb73165 Implements: blueprint upgrade-ceph-to-jewel
2016-09-01add iproute package in base image.Kevin Fox1-0/+3
This patch makes the ip tool available. Kolla-Kubernetes needs it to figure out what ip addresses are associated with the running containers as they are not known before hand. TrivialFix Change-Id: I4713bb9db471463dedeb4984a55dd86e903ef65b
2016-08-31Merge "Allow operators to override versionlock for redhat in base"Jenkins1-0/+2
2016-08-31Merge "Use dumb-init to manage the pid 1 process"Jenkins2-2/+4
2016-08-31Allow operators to override versionlock for redhat in basePaul Bourke1-0/+2
TrivialFix Change-Id: Iedec701e76cdf4e336abeae1286ba6359fcfeba1
2016-08-31Add a block around oraclelinux base package installPaul Bourke1-0/+2
Allow operators to customise the base package setup for oraclelinux in base, similar to Ubuntu (block base_ubuntu_package_installation) TrivialFix Change-Id: I9c790bd4f195492dc9d666cf865a7f142cfb1abe