diff options
Diffstat (limited to 'docker/designate/designate-api')
| -rw-r--r-- | docker/designate/designate-api/Dockerfile.j2 | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | docker/designate/designate-api/extend_start.sh (renamed from docker/designate/designate-api/start.sh) | 9 |
2 files changed, 2 insertions, 13 deletions
diff --git a/docker/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2 index f0b8ea6cf..4f7e25634 100644 --- a/docker/designate/designate-api/Dockerfile.j2 +++ b/docker/designate/designate-api/Dockerfile.j2 @@ -11,9 +11,7 @@ RUN yum install -y \ {% endif %} {% endif %} -COPY start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] +COPY extend_start.sh /usr/local/bin/kolla_extend_start +RUN chmod 755 /usr/local/bin/kolla_extend_start {{ include_footer }} diff --git a/docker/designate/designate-api/start.sh b/docker/designate/designate-api/extend_start.sh index 816715fa9..8fda9197b 100755..100644 --- a/docker/designate/designate-api/start.sh +++ b/docker/designate/designate-api/extend_start.sh @@ -1,11 +1,4 @@ #!/bin/bash -set -o errexit - -CMD="/usr/bin/designate-api" -ARGS="" - -# Loading common functions. -source /opt/kolla/kolla-common.sh # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # of the KOLLA_BOOTSTRAP variable being set, including empty. @@ -13,5 +6,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then su -s /bin/sh -c "designate-manage db_sync" designate exit 0 fi - -exec $CMD $ARGS |
