summaryrefslogtreecommitdiff
path: root/docker/glance/glance-registry
AgeCommit message (Collapse)AuthorFilesLines
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-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-09-13Add header blocks to all DockerfilesPaul Bourke1-0/+2
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-11Customizations for GlanceKirill Shileev1-0/+2
This patchset contains customization of Dockerfile of Glance containers Also removed mkdir /etc/ceph as obsolete. Change-Id: I3ba6e0d2dca1ecf72cf9f1b00e05e6955611c361 Partially-implements: blueprint third-party-plugin-support
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-12Move USER operation after footerSam Yaple1-2/+2
The USER operation affects all docker commands after it. This causes a problem with our {{ include_footer }} implementation since commands in that footer may require elevated permissions to perform. In the current implementation I can no longer remove my proxy settings once the USER has been changed. Change-Id: I9b2bab5a15f595f6d52a46c64ddf59ba5608b938 Partially-Implements: blueprint drop-root
2015-11-09drop root for glanceSteven Dake1-0/+2
This uses the grouping feature of sudo to limit the amount of times the base sudo file has to be modified to only once. The container contents always runs as the user root, except the software which is controlled by Kolla. This software may run as root, but it has undergone a security audit and preserves permissions of the correct files and does not permit the glance user to write any of the set_config.py control files. Change-Id: Ie3cd23edcde5b408a8f66970456279a1b15028e0 Partially-Implements: blueprint drop-root
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-5/+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-10/+0
Removes config-external for all services that have been replaced in Ansible Change-Id: I839a14418638b977fbc1d02ba6839811b0f909ea Partially-Implements: blueprint replace-config-external
2015-09-18Replace config-external with a JSON file for Glancerthallisey1-6/+5
Change-Id: I14187db31a009c150424ea28b854a78c9ae3941d Partially-Implements: blueprint replace-config-external
2015-08-28Move docker_templates to docker dirSam Yaple3-0/+32
Updated build.py to reflect this change. Deprecate --template option and make it a noop. Change-Id: I7cd98d1ee684a4c64984a49597159868152683b2 Partially-Implements: blueprint remove-docker-dir
2015-05-15Restructure builds to allow more flexibilitySam Yaple3-27/+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-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-27Change the default shell to bashChen Zhiwei1-1/+1
Unify the shell to bash in all Kolla scripts. Change-Id: Ib9591b2f8f344eb88455c5e9b7ecf2164fb5960a Implements: blueprint use-bash-shell
2015-04-06Remove EXPOSE options from DockerfilesSteven Dake1-2/+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-01Simplify `wait_for` callsMartin André1-2/+1
Rely on the the `check_for_*` functions and remove redundant `fail_unless_*` calls. Also change `wait_for` to exit when it is missing a required argument. Change-Id: I90c4545691d53185556e2838303ac3df0afaf9fa
2015-04-01Allow check_for_* functions to be consumed by wait_forMartin André1-1/+1
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-21Cleanup leftovers after wait_for was merged into kolla-common.shMartin André1-1/+1
Change-Id: I97ab671bfbdcf5434feedec617a938b30af4579b
2015-03-10Glance containers need to be changed so they work without kubernetesRyan Hallisey2-1/+4
This patch overlaps a little bit with https://review.openstack.org/#/c/162358/. There were some additional glance config that needs to be added to run without kubernetes. Co-authored by: Charles Crouch (charcrou@cisco.com) Change-Id: I1aab2f6e4a80aaf1e6c4b7fe330bcf9a7740fdc6
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
2014-12-03Cleanup variable checks in glance-registry/start.shMartin André1-2/+1
Remove redundant checks for MARIADB_SERVICE_HOST and DB_ROOT_PASSWORD that are performed in `check_for_db`, and add missing check for GLANCE_DB_USER. Change-Id: Ie8194ce76274a9356dcc0b51353873d8a632c66a
2014-10-22Update MAINTAINER in Dockerfiles to Kolla ProjectLars Kellogg-Stedman1-1/+1
Remove individual MAINTAINER information from Dockerfiles. Change-Id: I777df5cde049599dc786176e1d5b4b9597f0b334
2014-10-13glance: cleanup; use kolla-common; exit on errorsLars Kellogg-Stedman1-7/+8
cause glance start.sh scripts to exit on any errors (allowing kubernetes to reschedule the pod). Change-Id: Ibebbf47758a1dfc241cb04cdb12e44af77f92b55
2014-10-13correct various issues with glance images and configsLars Kellogg-Stedman1-0/+6
- update keystone endpoints/user on boot (to avoid problems caused by, e.g., a stale password or invalid endpoint urls) - require GLANCE_DB_PASSWORD and GLANCE_KEYSTONE_PASSWORD in the environment, since we start multiple containers Change-Id: I31214b81280ed34409f92e79003c1116d5737d2e
2014-10-07fix issues with glance scriptsLars Kellogg-Stedman1-28/+1
- glance was using wrong var name for admin_password - also missing "\" in several places, breaking multi-line crudini commands. - glance was using wrong tenant name - in the registry container, glance-manage appears to reference glance-api.conf - the glance.json config file was not spawning a registry container Change-Id: I280d1db3ed576988f2bf29ea665e1922a37f8752
2014-10-07renamed keystone servicesLars Kellogg-Stedman1-1/+1
This renames the keystone services so that they are named by function, rather than port number (which would be confusing if they were running on a different port). Change-Id: Ibb0263a133c28a104563df431870a9effe584012
2014-10-07use renamed mariadb servicesLars Kellogg-Stedman1-1/+1
This patch updates all the json files that reference the mariadb service variables to ues the new names. Labelling things foo-master crept into this repository from the kubernetes guestbook example (which has redis-master and redis-slaves). We're not running clustered software at the moment so these labels are unnecessary. Change-Id: I229d04c89aa13cb6cc2e1c33a0a7b21e1c6e9caa
2014-10-04introduce a new build mechanismLars Kellogg-Stedman2-4/+1
This patch replaces the collection of individual "build" scripts with a single script (tools/build-docker-image), made available as "build" inside each image directory. The build-docker-image script will, by default, build images tagged with the current commit id in order to prevent developers from accidentally stepping on each other or on release images. Documentation in docs/image-building.md describes the script in more detail. Change-Id: I444d5c2256a85223f8750a0904cb4b07f18ab67f
2014-10-03Updates to glance start scripts, db and user/role creationDan Radez1-15/+16
- adding db sync and db creation as utf8 - fixing user and role creation Partial-blueprint: kube-glance-container Change-Id: I15be99f26483e490fccc23d029f39645c13c724b
2014-09-30updating build and start scripts for glanceDan Radez2-2/+2
2014-09-25Add a push script for each of the separate daemonsSteven Dake1-0/+2
This pushes to the docker registry.
2014-09-25Make build tools build with kollaglue loginSteven Dake1-1/+1
Build with kollaglue login. Then we can upload all images under that user namespace.
2014-09-20Fix building of glance imagesSteven Dake2-2/+2
The rebuild on fedora-rdo-base broke glance building
2014-09-20Provide script to build docker imagesSteven Dake1-0/+2
Build all docker images one at a time or with one top level call
2014-09-20Base images from Fedora 20 + RDO IcehouseSteven Dake1-1/+1
Previously images were based from RHEL OSP + RDO Icehouse. This presents a problem in that internal urls are used to access the rhel7 repositories. For new contributors, we need something that can be accessed without special rhel7 permissions. mariadb and rabbitmq can from fedora cinder, glance, keystone can from fedora-rdo-base This patch also uses the RDO repositories from upstream. This patch also udpates the base fedora image with latest bits.
2014-09-18added a bunch of glance stuffLars Kellogg-Stedman2-6/+41
2014-09-18start work on glance imageLars Kellogg-Stedman1-0/+11