diff options
| author | Sam Yaple <sam@yaple.net> | 2015-05-13 06:46:24 -0500 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-05-15 01:32:22 -0500 |
| commit | 13062e23e86b5d86020949754540460cb5b0b4fe (patch) | |
| tree | e0b3c8411418949a3d8df221da7c8cb2831b6d5d /tools | |
| parent | 354ba01c8f5c7e1695cbea3bfc07aee5b75e76d9 (diff) | |
| download | kolla-13062e23e86b5d86020949754540460cb5b0b4fe.tar.gz kolla-13062e23e86b5d86020949754540460cb5b0b4fe.zip | |
Restructure builds to allow more flexibility
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
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/build-all-docker-images | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/tools/build-all-docker-images b/tools/build-all-docker-images index 1a6fbb17c..ed8c526da 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 |
