diff options
Diffstat (limited to 'docker/openvswitch/openvswitch-db-server')
| -rw-r--r-- | docker/openvswitch/openvswitch-db-server/Dockerfile.j2 | 5 | ||||
| -rw-r--r--[-rwxr-xr-x] | docker/openvswitch/openvswitch-db-server/extend_start.sh (renamed from docker/openvswitch/openvswitch-db-server/start.sh) | 6 |
2 files changed, 2 insertions, 9 deletions
diff --git a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 index 023bba83b..723c16071 100644 --- a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 @@ -1,8 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) -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/openvswitch/openvswitch-db-server/start.sh b/docker/openvswitch/openvswitch-db-server/extend_start.sh index 60347b2dc..606cd5fc1 100755..100644 --- a/docker/openvswitch/openvswitch-db-server/start.sh +++ b/docker/openvswitch/openvswitch-db-server/extend_start.sh @@ -1,12 +1,6 @@ #!/bin/bash -set -o errexit - -# Loading common functions. -source /opt/kolla/kolla-common.sh mkdir -p "/run/openvswitch" if [[ ! -e "/etc/openvswitch/conf.db" ]]; then ovsdb-tool create "/etc/openvswitch/conf.db" fi - -exec $CMD |