diff options
| author | Sam Yaple <sam@yaple.net> | 2015-09-30 11:23:39 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-10-06 03:30:26 +0000 |
| commit | cb4e875ae1e1ec2e6ddf8a6b37f42283697fd50c (patch) | |
| tree | da1028203186b45f869828dc5b4d17c13fadea94 /docker/haproxy | |
| parent | 3a56ce182662bcc9cf753024275034907ea36032 (diff) | |
| download | kolla-cb4e875ae1e1ec2e6ddf8a6b37f42283697fd50c.tar.gz kolla-cb4e875ae1e1ec2e6ddf8a6b37f42283697fd50c.zip | |
Common start.sh
The majority of the start.sh code is identical. This removes that
duplicate code while still maintaining the ability to call code in a
specific container.
The start.sh is moved into /usr/local/bin/kolla_start in the container
The extend_start.sh script is called by the kolla_start script at the
location /usr/local/bin/kolla_extend_start . It always exists because
we create a noop kolla_extend_start in the base directory. We override
it with extend_start.sh in a specific image should we need to.
Of note, the neutron-agents container is exempt from this new
structure due to it being a fat container.
Additionally, we fix the inconsistent permissions throughout. 644 for
repo files and the scripts are set to 755 via a Docker RUN command to
ensure someones local perm change won't break upstream containers.
Change-Id: I7da8d19965463ad30ee522a71183e3f092e0d6ad
Closes-Bug: #1501295
Diffstat (limited to 'docker/haproxy')
| -rw-r--r-- | docker/haproxy/Dockerfile.j2 | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | docker/haproxy/ensure_latest_config.sh | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | docker/haproxy/extend_start.sh (renamed from docker/haproxy/start.sh) | 9 |
3 files changed, 6 insertions, 7 deletions
diff --git a/docker/haproxy/Dockerfile.j2 b/docker/haproxy/Dockerfile.j2 index fe02ce804..e7a4abddd 100644 --- a/docker/haproxy/Dockerfile.j2 +++ b/docker/haproxy/Dockerfile.j2 @@ -19,9 +19,9 @@ RUN apt-get install -y --no-install-recommends haproxy \ {% endif %} -COPY start.sh / COPY ensure_latest_config.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 /opt/kolla/ensure_latest_config.sh {{ include_footer }} diff --git a/docker/haproxy/ensure_latest_config.sh b/docker/haproxy/ensure_latest_config.sh index af20175a6..af20175a6 100755..100644 --- a/docker/haproxy/ensure_latest_config.sh +++ b/docker/haproxy/ensure_latest_config.sh diff --git a/docker/haproxy/start.sh b/docker/haproxy/extend_start.sh index 3bdd4018a..cf50a5c9f 100755..100644 --- a/docker/haproxy/start.sh +++ b/docker/haproxy/extend_start.sh @@ -1,10 +1,6 @@ #!/bin/bash -set -o errexit - -# Loading common functions. -source /opt/kolla/kolla-common.sh - # We are intentionally not using exec so we can reload the haproxy config later +echo "Running command: '${CMD}'" $CMD # TODO(SamYaple): This has the potential for a race condition triggered by a @@ -12,3 +8,6 @@ $CMD while [[ -e "/proc/$(cat /run/haproxy.pid)" ]]; do sleep 5 done + +# Based on the above loop this point should never be reached +exit 1 |