aboutsummaryrefslogtreecommitdiff
path: root/docker/gnocchi/gnocchi-api
diff options
context:
space:
mode:
Diffstat (limited to 'docker/gnocchi/gnocchi-api')
-rw-r--r--docker/gnocchi/gnocchi-api/Dockerfile.j26
-rw-r--r--[-rwxr-xr-x]docker/gnocchi/gnocchi-api/extend_start.sh (renamed from docker/gnocchi/gnocchi-api/start.sh)10
2 files changed, 2 insertions, 14 deletions
diff --git a/docker/gnocchi/gnocchi-api/Dockerfile.j2 b/docker/gnocchi/gnocchi-api/Dockerfile.j2
index b9479c1d7..00c079726 100644
--- a/docker/gnocchi/gnocchi-api/Dockerfile.j2
+++ b/docker/gnocchi/gnocchi-api/Dockerfile.j2
@@ -13,9 +13,7 @@ RUN yum install -y \
{% endif %}
{% 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/gnocchi/gnocchi-api/start.sh b/docker/gnocchi/gnocchi-api/extend_start.sh
index bb91fb831..8ca5d7388 100755..100644
--- a/docker/gnocchi/gnocchi-api/start.sh
+++ b/docker/gnocchi/gnocchi-api/extend_start.sh
@@ -1,11 +1,4 @@
#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/gnocchi-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,6 +6,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
su -s /bin/sh -c "gnocchi-manage db_sync" gnocchi
exit 0
fi
-
-exec $CMD $ARGS
-