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/base | |
| 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/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 8 | ||||
| -rw-r--r-- | docker/base/kolla-common.sh | 5 | ||||
| -rw-r--r-- | docker/base/start.sh | 13 |
3 files changed, 20 insertions, 6 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 518491ccb..c17cfa25e 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -188,4 +188,10 @@ RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 199369E5404BD {% endif %} -COPY set_configs.py kolla-common.sh /opt/kolla/ +COPY set_configs.py /opt/kolla/ + +COPY start.sh /usr/local/bin/kolla_start +RUN touch /usr/local/bin/kolla_extend_start \ + && chmod 755 /usr/local/bin/kolla_start /usr/local/bin/kolla_extend_start /opt/kolla/set_configs.py + +CMD ["kolla_start"] diff --git a/docker/base/kolla-common.sh b/docker/base/kolla-common.sh deleted file mode 100644 index 0cbb04821..000000000 --- a/docker/base/kolla-common.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -# Copying configs into place if needed and set run command -python /opt/kolla/set_configs.py -CMD=$(cat /run_command) diff --git a/docker/base/start.sh b/docker/base/start.sh new file mode 100644 index 000000000..7d89f636c --- /dev/null +++ b/docker/base/start.sh @@ -0,0 +1,13 @@ +#!/bin/bash +set -o errexit + +# Processing /opt/kolla/config_files/config.json +python /opt/kolla/set_configs.py +CMD=$(cat /run_command) +ARGS="" + +# Run additional commands if present +source kolla_extend_start + +echo "Running command: '${CMD}${ARGS:+ $ARGS}'" +exec ${CMD} ${ARGS} |