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/swift | |
| 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/swift')
| l---------[-rwxr-xr-x] | docker/swift/swift-account/build | 3 | ||||
| -rwxr-xr-x | docker/swift/swift-account/push | 2 | ||||
| l---------[-rwxr-xr-x] | docker/swift/swift-base/build | 3 | ||||
| -rwxr-xr-x | docker/swift/swift-base/push | 2 | ||||
| l---------[-rwxr-xr-x] | docker/swift/swift-container/build | 3 | ||||
| -rwxr-xr-x | docker/swift/swift-container/push | 2 | ||||
| l---------[-rwxr-xr-x] | docker/swift/swift-object/build | 3 | ||||
| -rwxr-xr-x | docker/swift/swift-object/push | 2 | ||||
| l---------[-rwxr-xr-x] | docker/swift/swift-proxy-server/build | 3 | ||||
| -rwxr-xr-x | docker/swift/swift-proxy-server/push | 2 |
10 files changed, 5 insertions, 20 deletions
diff --git a/docker/swift/swift-account/build b/docker/swift/swift-account/build index 9db06bce9..43944faa0 100755..120000 --- a/docker/swift/swift-account/build +++ b/docker/swift/swift-account/build @@ -1,2 +1 @@ -#!/bin/bash -docker build --tag kollaglue/fedora-rdo-swift-account-server . +../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/swift/swift-account/push b/docker/swift/swift-account/push deleted file mode 100755 index e0aad88b9..000000000 --- a/docker/swift/swift-account/push +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -docker push kollaglue/fedora-rdo-swift-account . diff --git a/docker/swift/swift-base/build b/docker/swift/swift-base/build index b6dd0369b..43944faa0 100755..120000 --- a/docker/swift/swift-base/build +++ b/docker/swift/swift-base/build @@ -1,2 +1 @@ -#!/bin/bash -docker build --tag kollaglue/fedora-rdo-swift-base . +../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/swift/swift-base/push b/docker/swift/swift-base/push deleted file mode 100755 index 2f0213c4d..000000000 --- a/docker/swift/swift-base/push +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -docker push kollaglue/fedora-rdo-swift-base . diff --git a/docker/swift/swift-container/build b/docker/swift/swift-container/build index 949f7ac4c..43944faa0 100755..120000 --- a/docker/swift/swift-container/build +++ b/docker/swift/swift-container/build @@ -1,2 +1 @@ -#!/bin/bash -docker build --tag kollaglue/fedora-rdo-swift-container-server . +../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/swift/swift-container/push b/docker/swift/swift-container/push deleted file mode 100755 index a805879a3..000000000 --- a/docker/swift/swift-container/push +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -docker push kollaglue/fedora-rdo-swift-container . diff --git a/docker/swift/swift-object/build b/docker/swift/swift-object/build index eee05d6a9..43944faa0 100755..120000 --- a/docker/swift/swift-object/build +++ b/docker/swift/swift-object/build @@ -1,2 +1 @@ -#!/bin/bash -docker build --tag kollaglue/fedora-rdo-swift-object-server . +../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/swift/swift-object/push b/docker/swift/swift-object/push deleted file mode 100755 index 7f05b6379..000000000 --- a/docker/swift/swift-object/push +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -docker push kollaglue/fedora-rdo-swift-object . diff --git a/docker/swift/swift-proxy-server/build b/docker/swift/swift-proxy-server/build index 87de199be..43944faa0 100755..120000 --- a/docker/swift/swift-proxy-server/build +++ b/docker/swift/swift-proxy-server/build @@ -1,2 +1 @@ -#!/bin/bash -docker build --tag kollaglue/fedora-rdo-swift-proxy-server . +../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/swift/swift-proxy-server/push b/docker/swift/swift-proxy-server/push deleted file mode 100755 index 60208c931..000000000 --- a/docker/swift/swift-proxy-server/push +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -docker push kollaglue/fedora-rdo-swift-proxy . |
