diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-04 03:30:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-04 03:30:05 +0000 |
| commit | bf8d20826fe59a64a11f224578b36cedf72535e9 (patch) | |
| tree | 1b27198766671112501339868bd750f24d59573a /docker/centos/binary | |
| parent | eba77f7781eb30f6334dd253ae86c8ef50977c59 (diff) | |
| parent | 60b6c1d81e8735a50fcf776d5618d5b1dc82ff00 (diff) | |
| download | kolla-bf8d20826fe59a64a11f224578b36cedf72535e9.tar.gz kolla-bf8d20826fe59a64a11f224578b36cedf72535e9.zip | |
Merge "Add config-internal/config-external to Swift containers"
Diffstat (limited to 'docker/centos/binary')
12 files changed, 20 insertions, 4 deletions
diff --git a/docker/centos/binary/swift/swift-account/Dockerfile b/docker/centos/binary/swift/swift-account/Dockerfile index 2c26802e3..6c8d1cc19 100644 --- a/docker/centos/binary/swift/swift-account/Dockerfile +++ b/docker/centos/binary/swift/swift-account/Dockerfile @@ -2,5 +2,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) ADD ./start.sh /start.sh -CMD ["/start.sh"] +COPY config-internal.sh config-external.sh /opt/kolla/ + +CMD ["/start.sh"] diff --git a/docker/centos/binary/swift/swift-account/config-external.sh b/docker/centos/binary/swift/swift-account/config-external.sh new file mode 120000 index 000000000..e7c6637fe --- /dev/null +++ b/docker/centos/binary/swift/swift-account/config-external.sh @@ -0,0 +1 @@ +../../../../common/swift/swift-account/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-account/config-internal.sh b/docker/centos/binary/swift/swift-account/config-internal.sh new file mode 120000 index 000000000..48504d07e --- /dev/null +++ b/docker/centos/binary/swift/swift-account/config-internal.sh @@ -0,0 +1 @@ +../../../../common/swift/swift-account/config-internal.sh
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-container/Dockerfile b/docker/centos/binary/swift/swift-container/Dockerfile index 2c26802e3..6c8d1cc19 100644 --- a/docker/centos/binary/swift/swift-container/Dockerfile +++ b/docker/centos/binary/swift/swift-container/Dockerfile @@ -2,5 +2,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) ADD ./start.sh /start.sh -CMD ["/start.sh"] +COPY config-internal.sh config-external.sh /opt/kolla/ + +CMD ["/start.sh"] diff --git a/docker/centos/binary/swift/swift-container/config-external.sh b/docker/centos/binary/swift/swift-container/config-external.sh new file mode 120000 index 000000000..efc76b7af --- /dev/null +++ b/docker/centos/binary/swift/swift-container/config-external.sh @@ -0,0 +1 @@ +../../../../common/swift/swift-container/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-container/config-internal.sh b/docker/centos/binary/swift/swift-container/config-internal.sh new file mode 120000 index 000000000..789a210a3 --- /dev/null +++ b/docker/centos/binary/swift/swift-container/config-internal.sh @@ -0,0 +1 @@ +../../../../common/swift/swift-container/config-internal.sh
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-object/Dockerfile b/docker/centos/binary/swift/swift-object/Dockerfile index 2c26802e3..6c8d1cc19 100644 --- a/docker/centos/binary/swift/swift-object/Dockerfile +++ b/docker/centos/binary/swift/swift-object/Dockerfile @@ -2,5 +2,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) ADD ./start.sh /start.sh -CMD ["/start.sh"] +COPY config-internal.sh config-external.sh /opt/kolla/ + +CMD ["/start.sh"] diff --git a/docker/centos/binary/swift/swift-object/config-external.sh b/docker/centos/binary/swift/swift-object/config-external.sh new file mode 120000 index 000000000..f4256fa63 --- /dev/null +++ b/docker/centos/binary/swift/swift-object/config-external.sh @@ -0,0 +1 @@ +../../../../common/swift/swift-object/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-object/config-internal.sh b/docker/centos/binary/swift/swift-object/config-internal.sh new file mode 120000 index 000000000..3f8ba1de9 --- /dev/null +++ b/docker/centos/binary/swift/swift-object/config-internal.sh @@ -0,0 +1 @@ +../../../../common/swift/swift-object/config-internal.sh
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-proxy-server/Dockerfile b/docker/centos/binary/swift/swift-proxy-server/Dockerfile index 2c26802e3..6c8d1cc19 100644 --- a/docker/centos/binary/swift/swift-proxy-server/Dockerfile +++ b/docker/centos/binary/swift/swift-proxy-server/Dockerfile @@ -2,5 +2,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) ADD ./start.sh /start.sh -CMD ["/start.sh"] +COPY config-internal.sh config-external.sh /opt/kolla/ + +CMD ["/start.sh"] diff --git a/docker/centos/binary/swift/swift-proxy-server/config-external.sh b/docker/centos/binary/swift/swift-proxy-server/config-external.sh new file mode 120000 index 000000000..04e1c640f --- /dev/null +++ b/docker/centos/binary/swift/swift-proxy-server/config-external.sh @@ -0,0 +1 @@ +../../../../common/swift/swift-proxy-server/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-proxy-server/config-internal.sh b/docker/centos/binary/swift/swift-proxy-server/config-internal.sh new file mode 120000 index 000000000..f95866fdd --- /dev/null +++ b/docker/centos/binary/swift/swift-proxy-server/config-internal.sh @@ -0,0 +1 @@ +../../../../common/swift/swift-proxy-server/config-internal.sh
\ No newline at end of file |