diff --git a/docker/barbican/build b/docker/barbican/build deleted file mode 120000 index d2accf7d39..0000000000 --- a/docker/barbican/build +++ /dev/null @@ -1 +0,0 @@ -../../tools/build-docker-image \ No newline at end of file diff --git a/docker/ceilometer/ceilometer-alarm/build b/docker/ceilometer/ceilometer-alarm/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/ceilometer/ceilometer-alarm/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/ceilometer/ceilometer-api/build b/docker/ceilometer/ceilometer-api/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/ceilometer/ceilometer-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/ceilometer/ceilometer-base/build b/docker/ceilometer/ceilometer-base/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/ceilometer/ceilometer-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/ceilometer/ceilometer-central/build b/docker/ceilometer/ceilometer-central/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/ceilometer/ceilometer-central/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/ceilometer/ceilometer-collector/build b/docker/ceilometer/ceilometer-collector/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/ceilometer/ceilometer-collector/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/ceilometer/ceilometer-compute/build b/docker/ceilometer/ceilometer-compute/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/ceilometer/ceilometer-compute/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/ceilometer/ceilometer-notification/build b/docker/ceilometer/ceilometer-notification/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/ceilometer/ceilometer-notification/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos-rdo-base/build b/docker/centos-rdo-base/build deleted file mode 120000 index d2accf7d39..0000000000 --- a/docker/centos-rdo-base/build +++ /dev/null @@ -1 +0,0 @@ -../../tools/build-docker-image \ No newline at end of file diff --git a/docker/barbican/Dockerfile b/docker/centos/binary/barbican/Dockerfile similarity index 100% rename from docker/barbican/Dockerfile rename to docker/centos/binary/barbican/Dockerfile diff --git a/docker/centos/binary/barbican/build b/docker/centos/binary/barbican/build new file mode 120000 index 0000000000..8d652f7ee2 --- /dev/null +++ b/docker/centos/binary/barbican/build @@ -0,0 +1 @@ +../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/barbican/start.sh b/docker/centos/binary/barbican/start.sh similarity index 100% rename from docker/barbican/start.sh rename to docker/centos/binary/barbican/start.sh diff --git a/docker/base/kolla-common.sh b/docker/centos/binary/base/kolla-common.sh similarity index 100% rename from docker/base/kolla-common.sh rename to docker/centos/binary/base/kolla-common.sh diff --git a/docker/base/service_hosts.sh b/docker/centos/binary/base/service_hosts.sh similarity index 100% rename from docker/base/service_hosts.sh rename to docker/centos/binary/base/service_hosts.sh diff --git a/docker/ceilometer/ceilometer-alarm/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-alarm/Dockerfile similarity index 100% rename from docker/ceilometer/ceilometer-alarm/Dockerfile rename to docker/centos/binary/ceilometer/ceilometer-alarm/Dockerfile diff --git a/docker/centos/binary/ceilometer/ceilometer-alarm/build b/docker/centos/binary/ceilometer/ceilometer-alarm/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/ceilometer/ceilometer-alarm/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/ceilometer/ceilometer-alarm/start.sh b/docker/centos/binary/ceilometer/ceilometer-alarm/start.sh similarity index 100% rename from docker/ceilometer/ceilometer-alarm/start.sh rename to docker/centos/binary/ceilometer/ceilometer-alarm/start.sh diff --git a/docker/ceilometer/ceilometer-api/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-api/Dockerfile similarity index 100% rename from docker/ceilometer/ceilometer-api/Dockerfile rename to docker/centos/binary/ceilometer/ceilometer-api/Dockerfile diff --git a/docker/centos/binary/ceilometer/ceilometer-api/build b/docker/centos/binary/ceilometer/ceilometer-api/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/ceilometer/ceilometer-api/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/ceilometer/ceilometer-api/start.sh b/docker/centos/binary/ceilometer/ceilometer-api/start.sh similarity index 100% rename from docker/ceilometer/ceilometer-api/start.sh rename to docker/centos/binary/ceilometer/ceilometer-api/start.sh diff --git a/docker/ceilometer/ceilometer-base/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-base/Dockerfile similarity index 100% rename from docker/ceilometer/ceilometer-base/Dockerfile rename to docker/centos/binary/ceilometer/ceilometer-base/Dockerfile diff --git a/docker/centos/binary/ceilometer/ceilometer-base/build b/docker/centos/binary/ceilometer/ceilometer-base/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/ceilometer/ceilometer-base/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/ceilometer/ceilometer-base/config-ceilometer.sh b/docker/centos/binary/ceilometer/ceilometer-base/config-ceilometer.sh similarity index 100% rename from docker/ceilometer/ceilometer-base/config-ceilometer.sh rename to docker/centos/binary/ceilometer/ceilometer-base/config-ceilometer.sh diff --git a/docker/ceilometer/ceilometer-central/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-central/Dockerfile similarity index 100% rename from docker/ceilometer/ceilometer-central/Dockerfile rename to docker/centos/binary/ceilometer/ceilometer-central/Dockerfile diff --git a/docker/centos/binary/ceilometer/ceilometer-central/build b/docker/centos/binary/ceilometer/ceilometer-central/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/ceilometer/ceilometer-central/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/ceilometer/ceilometer-central/start.sh b/docker/centos/binary/ceilometer/ceilometer-central/start.sh similarity index 100% rename from docker/ceilometer/ceilometer-central/start.sh rename to docker/centos/binary/ceilometer/ceilometer-central/start.sh diff --git a/docker/ceilometer/ceilometer-collector/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-collector/Dockerfile similarity index 100% rename from docker/ceilometer/ceilometer-collector/Dockerfile rename to docker/centos/binary/ceilometer/ceilometer-collector/Dockerfile diff --git a/docker/centos/binary/ceilometer/ceilometer-collector/build b/docker/centos/binary/ceilometer/ceilometer-collector/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/ceilometer/ceilometer-collector/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/ceilometer/ceilometer-collector/start.sh b/docker/centos/binary/ceilometer/ceilometer-collector/start.sh similarity index 100% rename from docker/ceilometer/ceilometer-collector/start.sh rename to docker/centos/binary/ceilometer/ceilometer-collector/start.sh diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-compute/Dockerfile similarity index 100% rename from docker/ceilometer/ceilometer-compute/Dockerfile rename to docker/centos/binary/ceilometer/ceilometer-compute/Dockerfile diff --git a/docker/centos/binary/ceilometer/ceilometer-compute/build b/docker/centos/binary/ceilometer/ceilometer-compute/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/ceilometer/ceilometer-compute/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/ceilometer/ceilometer-compute/start.sh b/docker/centos/binary/ceilometer/ceilometer-compute/start.sh similarity index 100% rename from docker/ceilometer/ceilometer-compute/start.sh rename to docker/centos/binary/ceilometer/ceilometer-compute/start.sh diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-notification/Dockerfile similarity index 100% rename from docker/ceilometer/ceilometer-notification/Dockerfile rename to docker/centos/binary/ceilometer/ceilometer-notification/Dockerfile diff --git a/docker/centos/binary/ceilometer/ceilometer-notification/build b/docker/centos/binary/ceilometer/ceilometer-notification/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/ceilometer/ceilometer-notification/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/ceilometer/ceilometer-notification/start.sh b/docker/centos/binary/ceilometer/ceilometer-notification/start.sh similarity index 100% rename from docker/ceilometer/ceilometer-notification/start.sh rename to docker/centos/binary/ceilometer/ceilometer-notification/start.sh diff --git a/docker/centos-rdo-base/.buildconf b/docker/centos/binary/centos-binary-base/.buildconf similarity index 100% rename from docker/centos-rdo-base/.buildconf rename to docker/centos/binary/centos-binary-base/.buildconf diff --git a/docker/centos-rdo-base/Dockerfile b/docker/centos/binary/centos-binary-base/Dockerfile similarity index 100% rename from docker/centos-rdo-base/Dockerfile rename to docker/centos/binary/centos-binary-base/Dockerfile diff --git a/docker/centos/binary/centos-binary-base/build b/docker/centos/binary/centos-binary-base/build new file mode 120000 index 0000000000..8d652f7ee2 --- /dev/null +++ b/docker/centos/binary/centos-binary-base/build @@ -0,0 +1 @@ +../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos-rdo-base/kolla-common.sh b/docker/centos/binary/centos-binary-base/kolla-common.sh similarity index 100% rename from docker/centos-rdo-base/kolla-common.sh rename to docker/centos/binary/centos-binary-base/kolla-common.sh diff --git a/docker/centos-rdo-base/service_hosts.sh b/docker/centos/binary/centos-binary-base/service_hosts.sh similarity index 100% rename from docker/centos-rdo-base/service_hosts.sh rename to docker/centos/binary/centos-binary-base/service_hosts.sh diff --git a/docker/centos/binary/centos-rdo-base b/docker/centos/binary/centos-rdo-base new file mode 120000 index 0000000000..f3b111231c --- /dev/null +++ b/docker/centos/binary/centos-rdo-base @@ -0,0 +1 @@ +centos-binary-base/ \ No newline at end of file diff --git a/docker/cinder/Dockerfile b/docker/centos/binary/cinder/Dockerfile similarity index 100% rename from docker/cinder/Dockerfile rename to docker/centos/binary/cinder/Dockerfile diff --git a/docker/centos/binary/cinder/build b/docker/centos/binary/cinder/build new file mode 120000 index 0000000000..8d652f7ee2 --- /dev/null +++ b/docker/centos/binary/cinder/build @@ -0,0 +1 @@ +../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/cinder/start.sh b/docker/centos/binary/cinder/start.sh similarity index 100% rename from docker/cinder/start.sh rename to docker/centos/binary/cinder/start.sh diff --git a/docker/docker-compose/README.md b/docker/centos/binary/docker-compose/README.md similarity index 100% rename from docker/docker-compose/README.md rename to docker/centos/binary/docker-compose/README.md diff --git a/docker/fedora-rdo-base/.buildconf b/docker/centos/binary/fedora-binary-base/.buildconf similarity index 100% rename from docker/fedora-rdo-base/.buildconf rename to docker/centos/binary/fedora-binary-base/.buildconf diff --git a/docker/fedora-rdo-base/Dockerfile b/docker/centos/binary/fedora-binary-base/Dockerfile similarity index 100% rename from docker/fedora-rdo-base/Dockerfile rename to docker/centos/binary/fedora-binary-base/Dockerfile diff --git a/docker/centos/binary/fedora-binary-base/build b/docker/centos/binary/fedora-binary-base/build new file mode 120000 index 0000000000..8d652f7ee2 --- /dev/null +++ b/docker/centos/binary/fedora-binary-base/build @@ -0,0 +1 @@ +../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/fedora-rdo-base/kolla-common.sh b/docker/centos/binary/fedora-binary-base/kolla-common.sh similarity index 100% rename from docker/fedora-rdo-base/kolla-common.sh rename to docker/centos/binary/fedora-binary-base/kolla-common.sh diff --git a/docker/fedora-rdo-base/service_hosts.sh b/docker/centos/binary/fedora-binary-base/service_hosts.sh similarity index 100% rename from docker/fedora-rdo-base/service_hosts.sh rename to docker/centos/binary/fedora-binary-base/service_hosts.sh diff --git a/docker/centos/binary/fedora-rdo-base b/docker/centos/binary/fedora-rdo-base new file mode 120000 index 0000000000..a9be4eebb1 --- /dev/null +++ b/docker/centos/binary/fedora-rdo-base @@ -0,0 +1 @@ +fedora-binary-base \ No newline at end of file diff --git a/docker/glance/glance-api/Dockerfile b/docker/centos/binary/glance/glance-api/Dockerfile similarity index 100% rename from docker/glance/glance-api/Dockerfile rename to docker/centos/binary/glance/glance-api/Dockerfile diff --git a/docker/centos/binary/glance/glance-api/build b/docker/centos/binary/glance/glance-api/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/glance/glance-api/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/glance/glance-api/check.sh b/docker/centos/binary/glance/glance-api/check.sh similarity index 100% rename from docker/glance/glance-api/check.sh rename to docker/centos/binary/glance/glance-api/check.sh diff --git a/docker/glance/glance-api/start.sh b/docker/centos/binary/glance/glance-api/start.sh similarity index 100% rename from docker/glance/glance-api/start.sh rename to docker/centos/binary/glance/glance-api/start.sh diff --git a/docker/glance/glance-base/Dockerfile b/docker/centos/binary/glance/glance-base/Dockerfile similarity index 100% rename from docker/glance/glance-base/Dockerfile rename to docker/centos/binary/glance/glance-base/Dockerfile diff --git a/docker/centos/binary/glance/glance-base/build b/docker/centos/binary/glance/glance-base/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/glance/glance-base/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/glance/glance-base/config-glance.sh b/docker/centos/binary/glance/glance-base/config-glance.sh similarity index 100% rename from docker/glance/glance-base/config-glance.sh rename to docker/centos/binary/glance/glance-base/config-glance.sh diff --git a/docker/glance/glance-registry/Dockerfile b/docker/centos/binary/glance/glance-registry/Dockerfile similarity index 100% rename from docker/glance/glance-registry/Dockerfile rename to docker/centos/binary/glance/glance-registry/Dockerfile diff --git a/docker/centos/binary/glance/glance-registry/build b/docker/centos/binary/glance/glance-registry/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/glance/glance-registry/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/glance/glance-registry/start.sh b/docker/centos/binary/glance/glance-registry/start.sh similarity index 100% rename from docker/glance/glance-registry/start.sh rename to docker/centos/binary/glance/glance-registry/start.sh diff --git a/docker/hautoproxy/Dockerfile b/docker/centos/binary/hautoproxy/Dockerfile similarity index 100% rename from docker/hautoproxy/Dockerfile rename to docker/centos/binary/hautoproxy/Dockerfile diff --git a/docker/centos/binary/hautoproxy/build b/docker/centos/binary/hautoproxy/build new file mode 120000 index 0000000000..8d652f7ee2 --- /dev/null +++ b/docker/centos/binary/hautoproxy/build @@ -0,0 +1 @@ +../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/hautoproxy/haproxy.cfg.tmpl b/docker/centos/binary/hautoproxy/haproxy.cfg.tmpl similarity index 100% rename from docker/hautoproxy/haproxy.cfg.tmpl rename to docker/centos/binary/hautoproxy/haproxy.cfg.tmpl diff --git a/docker/hautoproxy/start.py b/docker/centos/binary/hautoproxy/start.py similarity index 100% rename from docker/hautoproxy/start.py rename to docker/centos/binary/hautoproxy/start.py diff --git a/docker/heat/heat-api-cfn/Dockerfile b/docker/centos/binary/heat/heat-api-cfn/Dockerfile similarity index 100% rename from docker/heat/heat-api-cfn/Dockerfile rename to docker/centos/binary/heat/heat-api-cfn/Dockerfile diff --git a/docker/centos/binary/heat/heat-api-cfn/build b/docker/centos/binary/heat/heat-api-cfn/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/heat/heat-api-cfn/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/heat/heat-api-cfn/check.sh b/docker/centos/binary/heat/heat-api-cfn/check.sh similarity index 100% rename from docker/heat/heat-api-cfn/check.sh rename to docker/centos/binary/heat/heat-api-cfn/check.sh diff --git a/docker/heat/heat-api-cfn/start.sh b/docker/centos/binary/heat/heat-api-cfn/start.sh similarity index 100% rename from docker/heat/heat-api-cfn/start.sh rename to docker/centos/binary/heat/heat-api-cfn/start.sh diff --git a/docker/heat/heat-api/Dockerfile b/docker/centos/binary/heat/heat-api/Dockerfile similarity index 100% rename from docker/heat/heat-api/Dockerfile rename to docker/centos/binary/heat/heat-api/Dockerfile diff --git a/docker/centos/binary/heat/heat-api/build b/docker/centos/binary/heat/heat-api/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/heat/heat-api/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/heat/heat-api/check.sh b/docker/centos/binary/heat/heat-api/check.sh similarity index 100% rename from docker/heat/heat-api/check.sh rename to docker/centos/binary/heat/heat-api/check.sh diff --git a/docker/heat/heat-api/start.sh b/docker/centos/binary/heat/heat-api/start.sh similarity index 100% rename from docker/heat/heat-api/start.sh rename to docker/centos/binary/heat/heat-api/start.sh diff --git a/docker/heat/heat-base/Dockerfile b/docker/centos/binary/heat/heat-base/Dockerfile similarity index 100% rename from docker/heat/heat-base/Dockerfile rename to docker/centos/binary/heat/heat-base/Dockerfile diff --git a/docker/centos/binary/heat/heat-base/build b/docker/centos/binary/heat/heat-base/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/heat/heat-base/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/heat/heat-base/config-heat.sh b/docker/centos/binary/heat/heat-base/config-heat.sh similarity index 100% rename from docker/heat/heat-base/config-heat.sh rename to docker/centos/binary/heat/heat-base/config-heat.sh diff --git a/docker/heat/heat-engine/Dockerfile b/docker/centos/binary/heat/heat-engine/Dockerfile similarity index 100% rename from docker/heat/heat-engine/Dockerfile rename to docker/centos/binary/heat/heat-engine/Dockerfile diff --git a/docker/centos/binary/heat/heat-engine/build b/docker/centos/binary/heat/heat-engine/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/heat/heat-engine/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/heat/heat-engine/start.sh b/docker/centos/binary/heat/heat-engine/start.sh similarity index 100% rename from docker/heat/heat-engine/start.sh rename to docker/centos/binary/heat/heat-engine/start.sh diff --git a/docker/horizon/Dockerfile b/docker/centos/binary/horizon/Dockerfile similarity index 100% rename from docker/horizon/Dockerfile rename to docker/centos/binary/horizon/Dockerfile diff --git a/docker/centos/binary/horizon/build b/docker/centos/binary/horizon/build new file mode 120000 index 0000000000..8d652f7ee2 --- /dev/null +++ b/docker/centos/binary/horizon/build @@ -0,0 +1 @@ +../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/horizon/start.sh b/docker/centos/binary/horizon/start.sh similarity index 100% rename from docker/horizon/start.sh rename to docker/centos/binary/horizon/start.sh diff --git a/docker/keystone/Dockerfile b/docker/centos/binary/keystone/Dockerfile similarity index 100% rename from docker/keystone/Dockerfile rename to docker/centos/binary/keystone/Dockerfile diff --git a/docker/centos/binary/keystone/build b/docker/centos/binary/keystone/build new file mode 120000 index 0000000000..8d652f7ee2 --- /dev/null +++ b/docker/centos/binary/keystone/build @@ -0,0 +1 @@ +../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/keystone/check.sh b/docker/centos/binary/keystone/check.sh similarity index 100% rename from docker/keystone/check.sh rename to docker/centos/binary/keystone/check.sh diff --git a/docker/keystone/start.sh b/docker/centos/binary/keystone/start.sh similarity index 100% rename from docker/keystone/start.sh rename to docker/centos/binary/keystone/start.sh diff --git a/docker/magnum/magnum-api/Dockerfile b/docker/centos/binary/magnum/magnum-api/Dockerfile similarity index 100% rename from docker/magnum/magnum-api/Dockerfile rename to docker/centos/binary/magnum/magnum-api/Dockerfile diff --git a/docker/centos/binary/magnum/magnum-api/build b/docker/centos/binary/magnum/magnum-api/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/magnum/magnum-api/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/magnum/magnum-api/check.sh b/docker/centos/binary/magnum/magnum-api/check.sh similarity index 100% rename from docker/magnum/magnum-api/check.sh rename to docker/centos/binary/magnum/magnum-api/check.sh diff --git a/docker/magnum/magnum-api/start.sh b/docker/centos/binary/magnum/magnum-api/start.sh similarity index 100% rename from docker/magnum/magnum-api/start.sh rename to docker/centos/binary/magnum/magnum-api/start.sh diff --git a/docker/magnum/magnum-base/Dockerfile b/docker/centos/binary/magnum/magnum-base/Dockerfile similarity index 100% rename from docker/magnum/magnum-base/Dockerfile rename to docker/centos/binary/magnum/magnum-base/Dockerfile diff --git a/docker/centos/binary/magnum/magnum-base/build b/docker/centos/binary/magnum/magnum-base/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/magnum/magnum-base/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/magnum/magnum-base/config-magnum.sh b/docker/centos/binary/magnum/magnum-base/config-magnum.sh similarity index 100% rename from docker/magnum/magnum-base/config-magnum.sh rename to docker/centos/binary/magnum/magnum-base/config-magnum.sh diff --git a/docker/magnum/magnum-conductor/Dockerfile b/docker/centos/binary/magnum/magnum-conductor/Dockerfile similarity index 100% rename from docker/magnum/magnum-conductor/Dockerfile rename to docker/centos/binary/magnum/magnum-conductor/Dockerfile diff --git a/docker/centos/binary/magnum/magnum-conductor/build b/docker/centos/binary/magnum/magnum-conductor/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/magnum/magnum-conductor/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/magnum/magnum-conductor/start.sh b/docker/centos/binary/magnum/magnum-conductor/start.sh similarity index 100% rename from docker/magnum/magnum-conductor/start.sh rename to docker/centos/binary/magnum/magnum-conductor/start.sh diff --git a/docker/mariadb-app/Dockerfile b/docker/centos/binary/mariadb-app/Dockerfile similarity index 100% rename from docker/mariadb-app/Dockerfile rename to docker/centos/binary/mariadb-app/Dockerfile diff --git a/docker/centos/binary/mariadb-app/build b/docker/centos/binary/mariadb-app/build new file mode 120000 index 0000000000..8d652f7ee2 --- /dev/null +++ b/docker/centos/binary/mariadb-app/build @@ -0,0 +1 @@ +../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/mariadb-app/config-mysql.sh b/docker/centos/binary/mariadb-app/config-mysql.sh similarity index 100% rename from docker/mariadb-app/config-mysql.sh rename to docker/centos/binary/mariadb-app/config-mysql.sh diff --git a/docker/mariadb-app/mysql-entrypoint.sh b/docker/centos/binary/mariadb-app/mysql-entrypoint.sh similarity index 100% rename from docker/mariadb-app/mysql-entrypoint.sh rename to docker/centos/binary/mariadb-app/mysql-entrypoint.sh diff --git a/docker/mariadb-data/Dockerfile b/docker/centos/binary/mariadb-data/Dockerfile similarity index 100% rename from docker/mariadb-data/Dockerfile rename to docker/centos/binary/mariadb-data/Dockerfile diff --git a/docker/centos/binary/mariadb-data/build b/docker/centos/binary/mariadb-data/build new file mode 120000 index 0000000000..8d652f7ee2 --- /dev/null +++ b/docker/centos/binary/mariadb-data/build @@ -0,0 +1 @@ +../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/mongodb/Dockerfile b/docker/centos/binary/mongodb/Dockerfile similarity index 100% rename from docker/mongodb/Dockerfile rename to docker/centos/binary/mongodb/Dockerfile diff --git a/docker/centos/binary/mongodb/build b/docker/centos/binary/mongodb/build new file mode 120000 index 0000000000..8d652f7ee2 --- /dev/null +++ b/docker/centos/binary/mongodb/build @@ -0,0 +1 @@ +../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/neutron/neutron-agents/Dockerfile b/docker/centos/binary/neutron/neutron-agents/Dockerfile similarity index 100% rename from docker/neutron/neutron-agents/Dockerfile rename to docker/centos/binary/neutron/neutron-agents/Dockerfile diff --git a/docker/centos/binary/neutron/neutron-agents/build b/docker/centos/binary/neutron/neutron-agents/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/neutron/neutron-agents/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/neutron/neutron-agents/check-scripts/check-dhcp-agent.sh b/docker/centos/binary/neutron/neutron-agents/check-scripts/check-dhcp-agent.sh similarity index 100% rename from docker/neutron/neutron-agents/check-scripts/check-dhcp-agent.sh rename to docker/centos/binary/neutron/neutron-agents/check-scripts/check-dhcp-agent.sh diff --git a/docker/neutron/neutron-agents/check-scripts/check-l3-agent.sh b/docker/centos/binary/neutron/neutron-agents/check-scripts/check-l3-agent.sh similarity index 100% rename from docker/neutron/neutron-agents/check-scripts/check-l3-agent.sh rename to docker/centos/binary/neutron/neutron-agents/check-scripts/check-l3-agent.sh diff --git a/docker/neutron/neutron-agents/check-scripts/check-linuxbridge-agent.sh b/docker/centos/binary/neutron/neutron-agents/check-scripts/check-linuxbridge-agent.sh similarity index 100% rename from docker/neutron/neutron-agents/check-scripts/check-linuxbridge-agent.sh rename to docker/centos/binary/neutron/neutron-agents/check-scripts/check-linuxbridge-agent.sh diff --git a/docker/neutron/neutron-agents/check-scripts/check-metadata-agent.sh b/docker/centos/binary/neutron/neutron-agents/check-scripts/check-metadata-agent.sh similarity index 100% rename from docker/neutron/neutron-agents/check-scripts/check-metadata-agent.sh rename to docker/centos/binary/neutron/neutron-agents/check-scripts/check-metadata-agent.sh diff --git a/docker/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh b/docker/centos/binary/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh similarity index 100% rename from docker/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh rename to docker/centos/binary/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh diff --git a/docker/neutron/neutron-agents/config-scripts/config-l3-agent.sh b/docker/centos/binary/neutron/neutron-agents/config-scripts/config-l3-agent.sh similarity index 100% rename from docker/neutron/neutron-agents/config-scripts/config-l3-agent.sh rename to docker/centos/binary/neutron/neutron-agents/config-scripts/config-l3-agent.sh diff --git a/docker/neutron/neutron-agents/config-scripts/config-linuxbridge-agent.sh b/docker/centos/binary/neutron/neutron-agents/config-scripts/config-linuxbridge-agent.sh similarity index 100% rename from docker/neutron/neutron-agents/config-scripts/config-linuxbridge-agent.sh rename to docker/centos/binary/neutron/neutron-agents/config-scripts/config-linuxbridge-agent.sh diff --git a/docker/neutron/neutron-agents/config-scripts/config-metadata-agent.sh b/docker/centos/binary/neutron/neutron-agents/config-scripts/config-metadata-agent.sh similarity index 100% rename from docker/neutron/neutron-agents/config-scripts/config-metadata-agent.sh rename to docker/centos/binary/neutron/neutron-agents/config-scripts/config-metadata-agent.sh diff --git a/docker/neutron/neutron-agents/config-scripts/config-sudoers.sh b/docker/centos/binary/neutron/neutron-agents/config-scripts/config-sudoers.sh similarity index 100% rename from docker/neutron/neutron-agents/config-scripts/config-sudoers.sh rename to docker/centos/binary/neutron/neutron-agents/config-scripts/config-sudoers.sh diff --git a/docker/neutron/neutron-agents/fwaas_driver.ini b/docker/centos/binary/neutron/neutron-agents/fwaas_driver.ini similarity index 100% rename from docker/neutron/neutron-agents/fwaas_driver.ini rename to docker/centos/binary/neutron/neutron-agents/fwaas_driver.ini diff --git a/docker/neutron/neutron-agents/supervisord.conf b/docker/centos/binary/neutron/neutron-agents/supervisord.conf similarity index 100% rename from docker/neutron/neutron-agents/supervisord.conf rename to docker/centos/binary/neutron/neutron-agents/supervisord.conf diff --git a/docker/neutron/neutron-base/Dockerfile b/docker/centos/binary/neutron/neutron-base/Dockerfile similarity index 100% rename from docker/neutron/neutron-base/Dockerfile rename to docker/centos/binary/neutron/neutron-base/Dockerfile diff --git a/docker/centos/binary/neutron/neutron-base/build b/docker/centos/binary/neutron/neutron-base/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/neutron/neutron-base/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/neutron/neutron-base/config-neutron.sh b/docker/centos/binary/neutron/neutron-base/config-neutron.sh similarity index 100% rename from docker/neutron/neutron-base/config-neutron.sh rename to docker/centos/binary/neutron/neutron-base/config-neutron.sh diff --git a/docker/neutron/neutron-server/Dockerfile b/docker/centos/binary/neutron/neutron-server/Dockerfile similarity index 100% rename from docker/neutron/neutron-server/Dockerfile rename to docker/centos/binary/neutron/neutron-server/Dockerfile diff --git a/docker/centos/binary/neutron/neutron-server/build b/docker/centos/binary/neutron/neutron-server/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/neutron/neutron-server/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/neutron/neutron-server/check.sh b/docker/centos/binary/neutron/neutron-server/check.sh similarity index 100% rename from docker/neutron/neutron-server/check.sh rename to docker/centos/binary/neutron/neutron-server/check.sh diff --git a/docker/neutron/neutron-server/start.sh b/docker/centos/binary/neutron/neutron-server/start.sh similarity index 100% rename from docker/neutron/neutron-server/start.sh rename to docker/centos/binary/neutron/neutron-server/start.sh diff --git a/docker/nova-base/Dockerfile b/docker/centos/binary/nova-base/Dockerfile similarity index 100% rename from docker/nova-base/Dockerfile rename to docker/centos/binary/nova-base/Dockerfile diff --git a/docker/centos/binary/nova-base/build b/docker/centos/binary/nova-base/build new file mode 120000 index 0000000000..8d652f7ee2 --- /dev/null +++ b/docker/centos/binary/nova-base/build @@ -0,0 +1 @@ +../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/nova-base/config-nova.sh b/docker/centos/binary/nova-base/config-nova.sh similarity index 100% rename from docker/nova-base/config-nova.sh rename to docker/centos/binary/nova-base/config-nova.sh diff --git a/docker/nova-compute/nova-compute-data/Dockerfile b/docker/centos/binary/nova-compute/nova-compute-data/Dockerfile similarity index 100% rename from docker/nova-compute/nova-compute-data/Dockerfile rename to docker/centos/binary/nova-compute/nova-compute-data/Dockerfile diff --git a/docker/centos/binary/nova-compute/nova-compute-data/build b/docker/centos/binary/nova-compute/nova-compute-data/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/nova-compute/nova-compute-data/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/nova-compute/nova-compute/Dockerfile b/docker/centos/binary/nova-compute/nova-compute/Dockerfile similarity index 100% rename from docker/nova-compute/nova-compute/Dockerfile rename to docker/centos/binary/nova-compute/nova-compute/Dockerfile diff --git a/docker/centos/binary/nova-compute/nova-compute/build b/docker/centos/binary/nova-compute/nova-compute/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/nova-compute/nova-compute/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/nova-compute/nova-compute/config-nova-compute.sh b/docker/centos/binary/nova-compute/nova-compute/config-nova-compute.sh similarity index 100% rename from docker/nova-compute/nova-compute/config-nova-compute.sh rename to docker/centos/binary/nova-compute/nova-compute/config-nova-compute.sh diff --git a/docker/nova-compute/nova-compute/start.sh b/docker/centos/binary/nova-compute/nova-compute/start.sh similarity index 100% rename from docker/nova-compute/nova-compute/start.sh rename to docker/centos/binary/nova-compute/nova-compute/start.sh diff --git a/docker/nova-compute/nova-libvirt/Dockerfile b/docker/centos/binary/nova-compute/nova-libvirt/Dockerfile similarity index 100% rename from docker/nova-compute/nova-libvirt/Dockerfile rename to docker/centos/binary/nova-compute/nova-libvirt/Dockerfile diff --git a/docker/centos/binary/nova-compute/nova-libvirt/build b/docker/centos/binary/nova-compute/nova-libvirt/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/nova-compute/nova-libvirt/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/nova-compute/nova-libvirt/start.sh b/docker/centos/binary/nova-compute/nova-libvirt/start.sh similarity index 100% rename from docker/nova-compute/nova-libvirt/start.sh rename to docker/centos/binary/nova-compute/nova-libvirt/start.sh diff --git a/docker/nova-compute/nova-network/Dockerfile b/docker/centos/binary/nova-compute/nova-network/Dockerfile similarity index 100% rename from docker/nova-compute/nova-network/Dockerfile rename to docker/centos/binary/nova-compute/nova-network/Dockerfile diff --git a/docker/centos/binary/nova-compute/nova-network/build b/docker/centos/binary/nova-compute/nova-network/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/nova-compute/nova-network/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/nova-compute/nova-network/config-nova-network.sh b/docker/centos/binary/nova-compute/nova-network/config-nova-network.sh similarity index 100% rename from docker/nova-compute/nova-network/config-nova-network.sh rename to docker/centos/binary/nova-compute/nova-network/config-nova-network.sh diff --git a/docker/nova-compute/nova-network/start.sh b/docker/centos/binary/nova-compute/nova-network/start.sh similarity index 100% rename from docker/nova-compute/nova-network/start.sh rename to docker/centos/binary/nova-compute/nova-network/start.sh diff --git a/docker/nova-controller/nova-api/Dockerfile b/docker/centos/binary/nova-controller/nova-api/Dockerfile similarity index 100% rename from docker/nova-controller/nova-api/Dockerfile rename to docker/centos/binary/nova-controller/nova-api/Dockerfile diff --git a/docker/centos/binary/nova-controller/nova-api/build b/docker/centos/binary/nova-controller/nova-api/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/nova-controller/nova-api/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/nova-controller/nova-api/check.sh b/docker/centos/binary/nova-controller/nova-api/check.sh similarity index 100% rename from docker/nova-controller/nova-api/check.sh rename to docker/centos/binary/nova-controller/nova-api/check.sh diff --git a/docker/nova-controller/nova-api/start.sh b/docker/centos/binary/nova-controller/nova-api/start.sh similarity index 100% rename from docker/nova-controller/nova-api/start.sh rename to docker/centos/binary/nova-controller/nova-api/start.sh diff --git a/docker/nova-controller/nova-conductor/Dockerfile b/docker/centos/binary/nova-controller/nova-conductor/Dockerfile similarity index 100% rename from docker/nova-controller/nova-conductor/Dockerfile rename to docker/centos/binary/nova-controller/nova-conductor/Dockerfile diff --git a/docker/centos/binary/nova-controller/nova-conductor/build b/docker/centos/binary/nova-controller/nova-conductor/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/nova-controller/nova-conductor/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/nova-controller/nova-conductor/start.sh b/docker/centos/binary/nova-controller/nova-conductor/start.sh similarity index 100% rename from docker/nova-controller/nova-conductor/start.sh rename to docker/centos/binary/nova-controller/nova-conductor/start.sh diff --git a/docker/nova-controller/nova-consoleauth/Dockerfile b/docker/centos/binary/nova-controller/nova-consoleauth/Dockerfile similarity index 100% rename from docker/nova-controller/nova-consoleauth/Dockerfile rename to docker/centos/binary/nova-controller/nova-consoleauth/Dockerfile diff --git a/docker/centos/binary/nova-controller/nova-consoleauth/build b/docker/centos/binary/nova-controller/nova-consoleauth/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/nova-controller/nova-consoleauth/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/nova-controller/nova-consoleauth/start.sh b/docker/centos/binary/nova-controller/nova-consoleauth/start.sh similarity index 100% rename from docker/nova-controller/nova-consoleauth/start.sh rename to docker/centos/binary/nova-controller/nova-consoleauth/start.sh diff --git a/docker/nova-controller/nova-novncproxy/Dockerfile b/docker/centos/binary/nova-controller/nova-novncproxy/Dockerfile similarity index 100% rename from docker/nova-controller/nova-novncproxy/Dockerfile rename to docker/centos/binary/nova-controller/nova-novncproxy/Dockerfile diff --git a/docker/centos/binary/nova-controller/nova-novncproxy/build b/docker/centos/binary/nova-controller/nova-novncproxy/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/nova-controller/nova-novncproxy/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/nova-controller/nova-novncproxy/start.sh b/docker/centos/binary/nova-controller/nova-novncproxy/start.sh similarity index 100% rename from docker/nova-controller/nova-novncproxy/start.sh rename to docker/centos/binary/nova-controller/nova-novncproxy/start.sh diff --git a/docker/nova-controller/nova-scheduler/Dockerfile b/docker/centos/binary/nova-controller/nova-scheduler/Dockerfile similarity index 100% rename from docker/nova-controller/nova-scheduler/Dockerfile rename to docker/centos/binary/nova-controller/nova-scheduler/Dockerfile diff --git a/docker/centos/binary/nova-controller/nova-scheduler/build b/docker/centos/binary/nova-controller/nova-scheduler/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/nova-controller/nova-scheduler/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/nova-controller/nova-scheduler/start.sh b/docker/centos/binary/nova-controller/nova-scheduler/start.sh similarity index 100% rename from docker/nova-controller/nova-scheduler/start.sh rename to docker/centos/binary/nova-controller/nova-scheduler/start.sh diff --git a/docker/rabbitmq/Dockerfile b/docker/centos/binary/rabbitmq/Dockerfile similarity index 100% rename from docker/rabbitmq/Dockerfile rename to docker/centos/binary/rabbitmq/Dockerfile diff --git a/docker/centos/binary/rabbitmq/build b/docker/centos/binary/rabbitmq/build new file mode 120000 index 0000000000..8d652f7ee2 --- /dev/null +++ b/docker/centos/binary/rabbitmq/build @@ -0,0 +1 @@ +../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/rabbitmq/rabbitmq-env.conf b/docker/centos/binary/rabbitmq/rabbitmq-env.conf similarity index 100% rename from docker/rabbitmq/rabbitmq-env.conf rename to docker/centos/binary/rabbitmq/rabbitmq-env.conf diff --git a/docker/rabbitmq/rabbitmq.config b/docker/centos/binary/rabbitmq/rabbitmq.config similarity index 100% rename from docker/rabbitmq/rabbitmq.config rename to docker/centos/binary/rabbitmq/rabbitmq.config diff --git a/docker/rabbitmq/start.sh b/docker/centos/binary/rabbitmq/start.sh similarity index 100% rename from docker/rabbitmq/start.sh rename to docker/centos/binary/rabbitmq/start.sh diff --git a/docker/rhel-osp-base/Dockerfile b/docker/centos/binary/rhel-osp-base/Dockerfile similarity index 100% rename from docker/rhel-osp-base/Dockerfile rename to docker/centos/binary/rhel-osp-base/Dockerfile diff --git a/docker/centos/binary/rhel-osp-base/build b/docker/centos/binary/rhel-osp-base/build new file mode 120000 index 0000000000..8d652f7ee2 --- /dev/null +++ b/docker/centos/binary/rhel-osp-base/build @@ -0,0 +1 @@ +../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/swift/swift-account/Dockerfile b/docker/centos/binary/swift/swift-account/Dockerfile similarity index 100% rename from docker/swift/swift-account/Dockerfile rename to docker/centos/binary/swift/swift-account/Dockerfile diff --git a/docker/centos/binary/swift/swift-account/build b/docker/centos/binary/swift/swift-account/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/swift/swift-account/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/swift/swift-account/start.sh b/docker/centos/binary/swift/swift-account/start.sh similarity index 100% rename from docker/swift/swift-account/start.sh rename to docker/centos/binary/swift/swift-account/start.sh diff --git a/docker/swift/swift-base/24q124 b/docker/centos/binary/swift/swift-base/24q124 similarity index 100% rename from docker/swift/swift-base/24q124 rename to docker/centos/binary/swift/swift-base/24q124 diff --git a/docker/swift/swift-base/Dockerfile b/docker/centos/binary/swift/swift-base/Dockerfile similarity index 100% rename from docker/swift/swift-base/Dockerfile rename to docker/centos/binary/swift/swift-base/Dockerfile diff --git a/docker/centos/binary/swift/swift-base/build b/docker/centos/binary/swift/swift-base/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/swift/swift-base/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/swift/swift-container/Dockerfile b/docker/centos/binary/swift/swift-container/Dockerfile similarity index 100% rename from docker/swift/swift-container/Dockerfile rename to docker/centos/binary/swift/swift-container/Dockerfile diff --git a/docker/centos/binary/swift/swift-container/build b/docker/centos/binary/swift/swift-container/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/swift/swift-container/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/swift/swift-container/start.sh b/docker/centos/binary/swift/swift-container/start.sh similarity index 100% rename from docker/swift/swift-container/start.sh rename to docker/centos/binary/swift/swift-container/start.sh diff --git a/docker/swift/swift-object/Dockerfile b/docker/centos/binary/swift/swift-object/Dockerfile similarity index 100% rename from docker/swift/swift-object/Dockerfile rename to docker/centos/binary/swift/swift-object/Dockerfile diff --git a/docker/centos/binary/swift/swift-object/build b/docker/centos/binary/swift/swift-object/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/swift/swift-object/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/swift/swift-object/start.sh b/docker/centos/binary/swift/swift-object/start.sh similarity index 100% rename from docker/swift/swift-object/start.sh rename to docker/centos/binary/swift/swift-object/start.sh diff --git a/docker/swift/swift-proxy-server/Dockerfile b/docker/centos/binary/swift/swift-proxy-server/Dockerfile similarity index 100% rename from docker/swift/swift-proxy-server/Dockerfile rename to docker/centos/binary/swift/swift-proxy-server/Dockerfile diff --git a/docker/centos/binary/swift/swift-proxy-server/build b/docker/centos/binary/swift/swift-proxy-server/build new file mode 120000 index 0000000000..ec19138031 --- /dev/null +++ b/docker/centos/binary/swift/swift-proxy-server/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/swift/swift-proxy-server/start.sh b/docker/centos/binary/swift/swift-proxy-server/start.sh similarity index 100% rename from docker/swift/swift-proxy-server/start.sh rename to docker/centos/binary/swift/swift-proxy-server/start.sh diff --git a/docker/zaqar/Dockerfile b/docker/centos/binary/zaqar/Dockerfile similarity index 100% rename from docker/zaqar/Dockerfile rename to docker/centos/binary/zaqar/Dockerfile diff --git a/docker/centos/binary/zaqar/build b/docker/centos/binary/zaqar/build new file mode 120000 index 0000000000..8d652f7ee2 --- /dev/null +++ b/docker/centos/binary/zaqar/build @@ -0,0 +1 @@ +../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/zaqar/check.sh b/docker/centos/binary/zaqar/check.sh similarity index 100% rename from docker/zaqar/check.sh rename to docker/centos/binary/zaqar/check.sh diff --git a/docker/zaqar/start.sh b/docker/centos/binary/zaqar/start.sh similarity index 100% rename from docker/zaqar/start.sh rename to docker/centos/binary/zaqar/start.sh diff --git a/docker/centos/rdo b/docker/centos/rdo new file mode 120000 index 0000000000..cab89b7b47 --- /dev/null +++ b/docker/centos/rdo @@ -0,0 +1 @@ +binary \ No newline at end of file diff --git a/docker/cinder/build b/docker/cinder/build deleted file mode 120000 index d2accf7d39..0000000000 --- a/docker/cinder/build +++ /dev/null @@ -1 +0,0 @@ -../../tools/build-docker-image \ No newline at end of file diff --git a/docker/fedora b/docker/fedora new file mode 120000 index 0000000000..95e1895490 --- /dev/null +++ b/docker/fedora @@ -0,0 +1 @@ +centos \ No newline at end of file diff --git a/docker/fedora-rdo-base/build b/docker/fedora-rdo-base/build deleted file mode 120000 index d2accf7d39..0000000000 --- a/docker/fedora-rdo-base/build +++ /dev/null @@ -1 +0,0 @@ -../../tools/build-docker-image \ No newline at end of file diff --git a/docker/glance/glance-api/build b/docker/glance/glance-api/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/glance/glance-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/glance/glance-base/build b/docker/glance/glance-base/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/glance/glance-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/glance/glance-registry/build b/docker/glance/glance-registry/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/glance/glance-registry/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/hautoproxy/build b/docker/hautoproxy/build deleted file mode 120000 index d2accf7d39..0000000000 --- a/docker/hautoproxy/build +++ /dev/null @@ -1 +0,0 @@ -../../tools/build-docker-image \ No newline at end of file diff --git a/docker/heat/heat-api-cfn/build b/docker/heat/heat-api-cfn/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/heat/heat-api-cfn/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/heat/heat-api/build b/docker/heat/heat-api/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/heat/heat-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/heat/heat-base/build b/docker/heat/heat-base/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/heat/heat-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/heat/heat-engine/build b/docker/heat/heat-engine/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/heat/heat-engine/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/horizon/build b/docker/horizon/build deleted file mode 120000 index d2accf7d39..0000000000 --- a/docker/horizon/build +++ /dev/null @@ -1 +0,0 @@ -../../tools/build-docker-image \ No newline at end of file diff --git a/docker/keystone/build b/docker/keystone/build deleted file mode 120000 index d2accf7d39..0000000000 --- a/docker/keystone/build +++ /dev/null @@ -1 +0,0 @@ -../../tools/build-docker-image \ No newline at end of file diff --git a/docker/magnum/magnum-api/build b/docker/magnum/magnum-api/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/magnum/magnum-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/magnum/magnum-base/build b/docker/magnum/magnum-base/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/magnum/magnum-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/magnum/magnum-conductor/build b/docker/magnum/magnum-conductor/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/magnum/magnum-conductor/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/mariadb-app/build b/docker/mariadb-app/build deleted file mode 120000 index d2accf7d39..0000000000 --- a/docker/mariadb-app/build +++ /dev/null @@ -1 +0,0 @@ -../../tools/build-docker-image \ No newline at end of file diff --git a/docker/mariadb-data/build b/docker/mariadb-data/build deleted file mode 120000 index d2accf7d39..0000000000 --- a/docker/mariadb-data/build +++ /dev/null @@ -1 +0,0 @@ -../../tools/build-docker-image \ No newline at end of file diff --git a/docker/mongodb/build b/docker/mongodb/build deleted file mode 120000 index d2accf7d39..0000000000 --- a/docker/mongodb/build +++ /dev/null @@ -1 +0,0 @@ -../../tools/build-docker-image \ No newline at end of file diff --git a/docker/neutron/neutron-agents/build b/docker/neutron/neutron-agents/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/neutron/neutron-agents/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/neutron/neutron-base/build b/docker/neutron/neutron-base/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/neutron/neutron-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/neutron/neutron-server/build b/docker/neutron/neutron-server/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/neutron/neutron-server/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/nova-base/build b/docker/nova-base/build deleted file mode 120000 index d2accf7d39..0000000000 --- a/docker/nova-base/build +++ /dev/null @@ -1 +0,0 @@ -../../tools/build-docker-image \ No newline at end of file diff --git a/docker/nova-compute/nova-compute-data/build b/docker/nova-compute/nova-compute-data/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/nova-compute/nova-compute-data/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/nova-compute/nova-compute/build b/docker/nova-compute/nova-compute/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/nova-compute/nova-compute/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/nova-compute/nova-libvirt/build b/docker/nova-compute/nova-libvirt/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/nova-compute/nova-libvirt/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/nova-compute/nova-network/build b/docker/nova-compute/nova-network/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/nova-compute/nova-network/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/nova-controller/nova-api/build b/docker/nova-controller/nova-api/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/nova-controller/nova-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/nova-controller/nova-conductor/build b/docker/nova-controller/nova-conductor/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/nova-controller/nova-conductor/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/nova-controller/nova-consoleauth/build b/docker/nova-controller/nova-consoleauth/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/nova-controller/nova-consoleauth/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/nova-controller/nova-novncproxy/build b/docker/nova-controller/nova-novncproxy/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/nova-controller/nova-novncproxy/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/nova-controller/nova-scheduler/build b/docker/nova-controller/nova-scheduler/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/nova-controller/nova-scheduler/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/rabbitmq/build b/docker/rabbitmq/build deleted file mode 120000 index d2accf7d39..0000000000 --- a/docker/rabbitmq/build +++ /dev/null @@ -1 +0,0 @@ -../../tools/build-docker-image \ No newline at end of file diff --git a/docker/rhel-osp-base/build b/docker/rhel-osp-base/build deleted file mode 120000 index d2accf7d39..0000000000 --- a/docker/rhel-osp-base/build +++ /dev/null @@ -1 +0,0 @@ -../../tools/build-docker-image \ No newline at end of file diff --git a/docker/swift/swift-account/build b/docker/swift/swift-account/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/swift/swift-account/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/swift/swift-base/build b/docker/swift/swift-base/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/swift/swift-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/swift/swift-container/build b/docker/swift/swift-container/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/swift/swift-container/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/swift/swift-object/build b/docker/swift/swift-object/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/swift/swift-object/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/swift/swift-proxy-server/build b/docker/swift/swift-proxy-server/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/swift/swift-proxy-server/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/zaqar/build b/docker/zaqar/build deleted file mode 120000 index d2accf7d39..0000000000 --- a/docker/zaqar/build +++ /dev/null @@ -1 +0,0 @@ -../../tools/build-docker-image \ No newline at end of file diff --git a/tools/build-all-docker-images b/tools/build-all-docker-images index 1a6fbb17c6..ed8c526da6 100755 --- a/tools/build-all-docker-images +++ b/tools/build-all-docker-images @@ -29,6 +29,7 @@ function warn { function set_defaults { PREFIX=centos-rdo- NAMESPACE=kollaglue + [ -f $WORKDIR/.buildconf ] && . $WORKDIR/.buildconf } function has_changed { @@ -191,8 +192,16 @@ while :; do shift done +set_defaults + +# BASE == centos, fedora, ubuntu, etc. +BASE=$(echo "${PREFIX}" | cut -d- -f1) +# TYPE == binary, source, rdo +TYPE=$(echo "${PREFIX}" | cut -d- -f2) + + # Do a first pass to find images to build and their dependencies -for dockerfile in $(find $DOCKERDIR -name Dockerfile); do +for dockerfile in $(find "${DOCKERDIR}/${BASE}/${TYPE}" -name Dockerfile); do init_image $(dirname $dockerfile) done