diff options
Diffstat (limited to 'docker/zaqar')
| -rw-r--r-- | docker/zaqar/Dockerfile.j2 | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | docker/zaqar/extend_start.sh (renamed from docker/zaqar/start.sh) | 9 |
2 files changed, 2 insertions, 13 deletions
diff --git a/docker/zaqar/Dockerfile.j2 b/docker/zaqar/Dockerfile.j2 index e406a8c8c..9a5346c97 100644 --- a/docker/zaqar/Dockerfile.j2 +++ b/docker/zaqar/Dockerfile.j2 @@ -20,9 +20,7 @@ RUN ln -s zaqar-source/* zaqar \ {% endif %} -COPY 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/zaqar/start.sh b/docker/zaqar/extend_start.sh index c5f1dea7f..d71b02aab 100755..100644 --- a/docker/zaqar/start.sh +++ b/docker/zaqar/extend_start.sh @@ -1,11 +1,4 @@ #!/bin/bash -set -o errexit - -CMD="/usr/bin/zaqar-server" -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 "zaqar-manage db_sync" cinder exit 0 fi - -exec $CMD $ARGS |