diff options
Diffstat (limited to 'docker/horizon')
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 5 | ||||
| -rw-r--r--[-rwxr-xr-x] | docker/horizon/extend_start.sh (renamed from docker/horizon/start.sh) | 6 |
2 files changed, 2 insertions, 9 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 427dd5965..cc8c5876e 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -56,8 +56,7 @@ RUN ln -s horizon-source/* horizon \ {% endif %} -COPY start.sh / - -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/horizon/start.sh b/docker/horizon/extend_start.sh index 784ff5e87..7a0bf9b55 100755..100644 --- a/docker/horizon/start.sh +++ b/docker/horizon/extend_start.sh @@ -1,13 +1,7 @@ #!/bin/bash -set -o errexit - -# Loading common functions -source /opt/kolla/kolla-common.sh if [[ "${KOLLA_BASE_DISTRO}" == "ubuntu" || \ "${KOLLA_BASE_DISTRO}" == "debian" ]]; then # Loading Apache2 ENV variables source /etc/apache2/envvars fi - -exec $CMD |