diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-09 17:17:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-09 17:17:07 +0000 |
| commit | bbe03ebe1aa5e62876cfa6c3bf656c3a85cde22e (patch) | |
| tree | fafc07075c046ab9740e858f33f3b96933a36b03 /docker | |
| parent | 34a6d11c0f9606b4a0682d4205f7c11bcf63d386 (diff) | |
| parent | a7223799c98921e886f0ac267975f46ec9a2b759 (diff) | |
| download | kolla-bbe03ebe1aa5e62876cfa6c3bf656c3a85cde22e.tar.gz kolla-bbe03ebe1aa5e62876cfa6c3bf656c3a85cde22e.zip | |
Merge "Remove config-internal for memcached"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/centos/binary/memcached/Dockerfile | 3 | ||||
| l--------- | docker/centos/binary/memcached/config-internal.sh | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | docker/common/memcached/config-external.sh | 0 | ||||
| -rwxr-xr-x | docker/common/memcached/config-internal.sh | 8 | ||||
| -rwxr-xr-x | docker/common/memcached/start.sh | 2 |
5 files changed, 2 insertions, 12 deletions
diff --git a/docker/centos/binary/memcached/Dockerfile b/docker/centos/binary/memcached/Dockerfile index 019eb4312..0e9cf86b3 100644 --- a/docker/centos/binary/memcached/Dockerfile +++ b/docker/centos/binary/memcached/Dockerfile @@ -4,7 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum -y install memcached && yum clean all COPY start.sh / - -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/memcached/config-internal.sh b/docker/centos/binary/memcached/config-internal.sh deleted file mode 120000 index 7ae7016a6..000000000 --- a/docker/centos/binary/memcached/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../docker/common/memcached/config-internal.sh
\ No newline at end of file diff --git a/docker/common/memcached/config-external.sh b/docker/common/memcached/config-external.sh index ab9593896..ab9593896 100755..100644 --- a/docker/common/memcached/config-external.sh +++ b/docker/common/memcached/config-external.sh diff --git a/docker/common/memcached/config-internal.sh b/docker/common/memcached/config-internal.sh deleted file mode 100755 index f27cf1a83..000000000 --- a/docker/common/memcached/config-internal.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -set -o errexit - -CMD="/usr/bin/memcached" -ARGS="-u memcached -vv" - -exec $CMD $ARGS diff --git a/docker/common/memcached/start.sh b/docker/common/memcached/start.sh index 5348a3b5e..2d69b41b7 100755 --- a/docker/common/memcached/start.sh +++ b/docker/common/memcached/start.sh @@ -8,7 +8,7 @@ ARGS="-u memcached -vv" # Loading common functions. source /opt/kolla/kolla-common.sh -# Config-internal script exec out of this function, it does not return here. +# Execute config strategy set_configs exec $CMD $ARGS |