openstack/kolla-ansible
Code Issues Proposed changes

Restructure builds to allow more flexibility

Browse Source 
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
This commit is contained in:
Sam Yaple
2015-05-13 06:46:24 -05:00
parent 354ba01c8f
commit 13062e23e8
224 changed files with 62 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docker/barbican/build
View File

@@ -1 +0,0 @@
../../tools/build-docker-image

1
docker/ceilometer/ceilometer-alarm/build
View File

@@ -1 +0,0 @@
../../../tools/build-docker-image

1
docker/ceilometer/ceilometer-api/build
View File

@@ -1 +0,0 @@
../../../tools/build-docker-image

1
docker/ceilometer/ceilometer-base/build
View File

@@ -1 +0,0 @@
../../../tools/build-docker-image

1
docker/ceilometer/ceilometer-central/build
View File

@@ -1 +0,0 @@
../../../tools/build-docker-image

1
docker/ceilometer/ceilometer-collector/build
View File

@@ -1 +0,0 @@
../../../tools/build-docker-image

1
docker/ceilometer/ceilometer-compute/build
View File

@@ -1 +0,0 @@
../../../tools/build-docker-image

1
docker/ceilometer/ceilometer-notification/build
View File

@@ -1 +0,0 @@
../../../tools/build-docker-image

1
docker/centos-rdo-base/build
View File

@@ -1 +0,0 @@
../../tools/build-docker-image

0
docker/barbican/Dockerfile → docker/centos/binary/barbican/Dockerfile
View File

1
docker/centos/binary/barbican/build Symbolic link
View File

@@ -0,0 +1 @@
../../../../tools/build-docker-image

0
docker/barbican/start.sh → docker/centos/binary/barbican/start.sh
View File

0
docker/base/kolla-common.sh → docker/centos/binary/base/kolla-common.sh
View File

0
docker/base/service_hosts.sh → docker/centos/binary/base/service_hosts.sh
View File

0
docker/ceilometer/ceilometer-alarm/Dockerfile → docker/centos/binary/ceilometer/ceilometer-alarm/Dockerfile
View File

1
docker/centos/binary/ceilometer/ceilometer-alarm/build Symbolic link
View File

@@ -0,0 +1 @@
../../../../../tools/build-docker-image

0
docker/ceilometer/ceilometer-alarm/start.sh → docker/centos/binary/ceilometer/ceilometer-alarm/start.sh
View File

0
docker/ceilometer/ceilometer-api/Dockerfile → docker/centos/binary/ceilometer/ceilometer-api/Dockerfile
View File

1
docker/centos/binary/ceilometer/ceilometer-api/build Symbolic link
View File

@@ -0,0 +1 @@
../../../../../tools/build-docker-image

0
docker/ceilometer/ceilometer-api/start.sh → docker/centos/binary/ceilometer/ceilometer-api/start.sh
View File

0
docker/ceilometer/ceilometer-base/Dockerfile → docker/centos/binary/ceilometer/ceilometer-base/Dockerfile
View File

1
docker/centos/binary/ceilometer/ceilometer-base/build Symbolic link
View File

@@ -0,0 +1 @@
../../../../../tools/build-docker-image

0
docker/ceilometer/ceilometer-base/config-ceilometer.sh → docker/centos/binary/ceilometer/ceilometer-base/config-ceilometer.sh
View File

0
docker/ceilometer/ceilometer-central/Dockerfile → docker/centos/binary/ceilometer/ceilometer-central/Dockerfile
View File

1
docker/centos/binary/ceilometer/ceilometer-central/build Symbolic link
View File

@@ -0,0 +1 @@
../../../../../tools/build-docker-image

0
docker/ceilometer/ceilometer-central/start.sh → docker/centos/binary/ceilometer/ceilometer-central/start.sh
View File

0
docker/ceilometer/ceilometer-collector/Dockerfile → docker/centos/binary/ceilometer/ceilometer-collector/Dockerfile
View File

1
docker/centos/binary/ceilometer/ceilometer-collector/build Symbolic link
View File

@@ -0,0 +1 @@
../../../../../tools/build-docker-image

0
docker/ceilometer/ceilometer-collector/start.sh → docker/centos/binary/ceilometer/ceilometer-collector/start.sh
View File

0
docker/ceilometer/ceilometer-compute/Dockerfile → docker/centos/binary/ceilometer/ceilometer-compute/Dockerfile
View File

1
docker/centos/binary/ceilometer/ceilometer-compute/build Symbolic link
View File

@@ -0,0 +1 @@
../../../../../tools/build-docker-image

0
docker/ceilometer/ceilometer-compute/start.sh → docker/centos/binary/ceilometer/ceilometer-compute/start.sh
View File

0
docker/ceilometer/ceilometer-notification/Dockerfile → docker/centos/binary/ceilometer/ceilometer-notification/Dockerfile
View File

1
docker/centos/binary/ceilometer/ceilometer-notification/build Symbolic link
View File

@@ -0,0 +1 @@
../../../../../tools/build-docker-image

0
docker/ceilometer/ceilometer-notification/start.sh → docker/centos/binary/ceilometer/ceilometer-notification/start.sh
View File

0
docker/centos-rdo-base/.buildconf → docker/centos/binary/centos-binary-base/.buildconf
View File

0
docker/centos-rdo-base/Dockerfile → docker/centos/binary/centos-binary-base/Dockerfile
View File

1
docker/centos/binary/centos-binary-base/build Symbolic link
View File

@@ -0,0 +1 @@
../../../../tools/build-docker-image

0
docker/centos-rdo-base/kolla-common.sh → docker/centos/binary/centos-binary-base/kolla-common.sh
View File

0
docker/centos-rdo-base/service_hosts.sh → docker/centos/binary/centos-binary-base/service_hosts.sh
View File

1
docker/centos/binary/centos-rdo-base Symbolic link
View File

@@ -0,0 +1 @@
centos-binary-base/

0
docker/cinder/Dockerfile → docker/centos/binary/cinder/Dockerfile
View File

1
docker/centos/binary/cinder/build Symbolic link
View File

@@ -0,0 +1 @@
../../../../tools/build-docker-image

0
docker/cinder/start.sh → docker/centos/binary/cinder/start.sh
View File

0
docker/docker-compose/README.md → docker/centos/binary/docker-compose/README.md
View File

0
docker/fedora-rdo-base/.buildconf → docker/centos/binary/fedora-binary-base/.buildconf
View File

0
docker/fedora-rdo-base/Dockerfile → docker/centos/binary/fedora-binary-base/Dockerfile
View File

1
docker/centos/binary/fedora-binary-base/build Symbolic link
View File

@@ -0,0 +1 @@
../../../../tools/build-docker-image

0
docker/fedora-rdo-base/kolla-common.sh → docker/centos/binary/fedora-binary-base/kolla-common.sh
View File

0
docker/fedora-rdo-base/service_hosts.sh → docker/centos/binary/fedora-binary-base/service_hosts.sh
View File

1
docker/centos/binary/fedora-rdo-base Symbolic link
View File

@@ -0,0 +1 @@
fedora-binary-base

0
docker/glance/glance-api/Dockerfile → docker/centos/binary/glance/glance-api/Dockerfile
View File

1
docker/centos/binary/glance/glance-api/build Symbolic link
View File

@@ -0,0 +1 @@
../../../../../tools/build-docker-image

0
docker/glance/glance-api/check.sh → docker/centos/binary/glance/glance-api/check.sh
View File

0
docker/glance/glance-api/start.sh → docker/centos/binary/glance/glance-api/start.sh
View File

0
docker/glance/glance-base/Dockerfile → docker/centos/binary/glance/glance-base/Dockerfile
View File

1
docker/centos/binary/glance/glance-base/build Symbolic link
View File

@@ -0,0 +1 @@
../../../../../tools/build-docker-image

0
docker/glance/glance-base/config-glance.sh → docker/centos/binary/glance/glance-base/config-glance.sh
View File

0
docker/glance/glance-registry/Dockerfile → docker/centos/binary/glance/glance-registry/Dockerfile
View File

1
docker/centos/binary/glance/glance-registry/build Symbolic link
View File

@@ -0,0 +1 @@
../../../../../tools/build-docker-image

0
docker/glance/glance-registry/start.sh → docker/centos/binary/glance/glance-registry/start.sh
View File

0
docker/hautoproxy/Dockerfile → docker/centos/binary/hautoproxy/Dockerfile
View File

1
docker/centos/binary/hautoproxy/build Symbolic link
View File

@@ -0,0 +1 @@
../../../../tools/build-docker-image

0
docker/hautoproxy/haproxy.cfg.tmpl → docker/centos/binary/hautoproxy/haproxy.cfg.tmpl
View File

0
docker/hautoproxy/start.py → docker/centos/binary/hautoproxy/start.py
View File

0
docker/heat/heat-api-cfn/Dockerfile → docker/centos/binary/heat/heat-api-cfn/Dockerfile
View File

1
docker/centos/binary/heat/heat-api-cfn/build Symbolic link
View File

@@ -0,0 +1 @@
../../../../../tools/build-docker-image

0
docker/heat/heat-api-cfn/check.sh → docker/centos/binary/heat/heat-api-cfn/check.sh
View File

0
docker/heat/heat-api-cfn/start.sh → docker/centos/binary/heat/heat-api-cfn/start.sh
View File

0
docker/heat/heat-api/Dockerfile → docker/centos/binary/heat/heat-api/Dockerfile
View File

1
docker/centos/binary/heat/heat-api/build Symbolic link
View File

@@ -0,0 +1 @@
../../../../../tools/build-docker-image

0
docker/heat/heat-api/check.sh → docker/centos/binary/heat/heat-api/check.sh
View File

0
docker/heat/heat-api/start.sh → docker/centos/binary/heat/heat-api/start.sh
View File

0
docker/heat/heat-base/Dockerfile → docker/centos/binary/heat/heat-base/Dockerfile
View File

1
docker/centos/binary/heat/heat-base/build Symbolic link
View File

@@ -0,0 +1 @@
../../../../../tools/build-docker-image

0
docker/heat/heat-base/config-heat.sh → docker/centos/binary/heat/heat-base/config-heat.sh
View File

0
docker/heat/heat-engine/Dockerfile → docker/centos/binary/heat/heat-engine/Dockerfile
View File

1
docker/centos/binary/heat/heat-engine/build Symbolic link
View File

@@ -0,0 +1 @@
../../../../../tools/build-docker-image

0
docker/heat/heat-engine/start.sh → docker/centos/binary/heat/heat-engine/start.sh
View File

0
docker/horizon/Dockerfile → docker/centos/binary/horizon/Dockerfile
View File

1
docker/centos/binary/horizon/build Symbolic link
View File

@@ -0,0 +1 @@
../../../../tools/build-docker-image

0
docker/horizon/start.sh → docker/centos/binary/horizon/start.sh
View File

0
docker/keystone/Dockerfile → docker/centos/binary/keystone/Dockerfile
View File

1
docker/centos/binary/keystone/build Symbolic link
View File

@@ -0,0 +1 @@
../../../../tools/build-docker-image

0
docker/keystone/check.sh → docker/centos/binary/keystone/check.sh
View File

0
docker/keystone/start.sh → docker/centos/binary/keystone/start.sh
View File

0
docker/magnum/magnum-api/Dockerfile → docker/centos/binary/magnum/magnum-api/Dockerfile
View File

1
docker/centos/binary/magnum/magnum-api/build Symbolic link
View File

@@ -0,0 +1 @@
../../../../../tools/build-docker-image

0
docker/magnum/magnum-api/check.sh → docker/centos/binary/magnum/magnum-api/check.sh
View File

0
docker/magnum/magnum-api/start.sh → docker/centos/binary/magnum/magnum-api/start.sh
View File

0
docker/magnum/magnum-base/Dockerfile → docker/centos/binary/magnum/magnum-base/Dockerfile
View File

1
docker/centos/binary/magnum/magnum-base/build Symbolic link
View File

@@ -0,0 +1 @@
../../../../../tools/build-docker-image

0
docker/magnum/magnum-base/config-magnum.sh → docker/centos/binary/magnum/magnum-base/config-magnum.sh
View File

0
docker/magnum/magnum-conductor/Dockerfile → docker/centos/binary/magnum/magnum-conductor/Dockerfile
View File

1
docker/centos/binary/magnum/magnum-conductor/build Symbolic link
View File

@@ -0,0 +1 @@
../../../../../tools/build-docker-image

0
docker/magnum/magnum-conductor/start.sh → docker/centos/binary/magnum/magnum-conductor/start.sh
View File

0
docker/mariadb-app/Dockerfile → docker/centos/binary/mariadb-app/Dockerfile
View File

1
docker/centos/binary/mariadb-app/build Symbolic link
View File

@@ -0,0 +1 @@
../../../../tools/build-docker-image

0
docker/mariadb-app/config-mysql.sh → docker/centos/binary/mariadb-app/config-mysql.sh
View File

0
docker/mariadb-app/mysql-entrypoint.sh → docker/centos/binary/mariadb-app/mysql-entrypoint.sh
View File

Some files were not shown because too many files have changed in this diff Show More