diff options
| author | Lars Kellogg-Stedman <lars@redhat.com> | 2014-10-03 16:20:18 -0400 |
|---|---|---|
| committer | Lars Kellogg-Stedman <lars@redhat.com> | 2014-10-04 11:03:39 -0400 |
| commit | 24b6db92bc5cf56a5e2c1da3481ee57bddba7c80 (patch) | |
| tree | 5a2473f302db43d4ddf329f1cc9a38d1c87b0ec6 /docker/heat | |
| parent | 9ce465d544cfecb7f96e7b453d7ad567775da648 (diff) | |
| download | kolla-24b6db92bc5cf56a5e2c1da3481ee57bddba7c80.tar.gz kolla-24b6db92bc5cf56a5e2c1da3481ee57bddba7c80.zip | |
introduce a new build mechanism
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
Diffstat (limited to 'docker/heat')
| l---------[-rwxr-xr-x] | docker/heat/heat-api/build | 3 | ||||
| -rwxr-xr-x | docker/heat/heat-api/push | 2 | ||||
| l---------[-rwxr-xr-x] | docker/heat/heat-base/build | 3 | ||||
| -rwxr-xr-x | docker/heat/heat-base/push | 2 | ||||
| l---------[-rwxr-xr-x] | docker/heat/heat-engine/build | 3 | ||||
| -rwxr-xr-x | docker/heat/heat-engine/push | 2 |
6 files changed, 3 insertions, 12 deletions
diff --git a/docker/heat/heat-api/build b/docker/heat/heat-api/build index 16a5acc1d..43944faa0 100755..120000 --- a/docker/heat/heat-api/build +++ b/docker/heat/heat-api/build @@ -1,2 +1 @@ -#!/bin/bash -docker build --tag kollaglue/fedora-rdo-heat-api . +../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/heat/heat-api/push b/docker/heat/heat-api/push deleted file mode 100755 index 3ab396aee..000000000 --- a/docker/heat/heat-api/push +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -docker push kollaglue/fedora-rdo-heat-api . diff --git a/docker/heat/heat-base/build b/docker/heat/heat-base/build index e20076c89..43944faa0 100755..120000 --- a/docker/heat/heat-base/build +++ b/docker/heat/heat-base/build @@ -1,2 +1 @@ -#!/bin/bash -docker build --tag kollaglue/fedora-rdo-heat-base . +../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/heat/heat-base/push b/docker/heat/heat-base/push deleted file mode 100755 index ef525ec87..000000000 --- a/docker/heat/heat-base/push +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -docker push kollaglue/fedora-rdo-heat-base . diff --git a/docker/heat/heat-engine/build b/docker/heat/heat-engine/build index 1a2f7ccbb..43944faa0 100755..120000 --- a/docker/heat/heat-engine/build +++ b/docker/heat/heat-engine/build @@ -1,2 +1 @@ -#!/bin/bash -docker build --tag kollaglue/fedora-rdo-heat-engine . +../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/heat/heat-engine/push b/docker/heat/heat-engine/push deleted file mode 100755 index 9948eb100..000000000 --- a/docker/heat/heat-engine/push +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -docker push kollaglue/fedora-rdo-heat-engine . |