diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-14 10:33:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-14 10:33:16 +0000 |
| commit | 6d057c2884bcb37143c1f8947be5db19503ee8c9 (patch) | |
| tree | ab5312b794971e373188d218c4a4352dd156f631 | |
| parent | 1d5754f2c60ae2fa0b2e1671b1a81d4d88ed0346 (diff) | |
| parent | 6eccfe5897f45ed19bddbc4b00e77ad6464fcd80 (diff) | |
| download | kolla-6d057c2884bcb37143c1f8947be5db19503ee8c9.tar.gz kolla-6d057c2884bcb37143c1f8947be5db19503ee8c9.zip | |
Merge "Fix trove dockerfile"
| -rw-r--r-- | docker/trove/trove-api/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/trove/trove-base/Dockerfile.j2 | 8 | ||||
| -rw-r--r-- | docker/trove/trove-base/extend_start.sh | 10 |
3 files changed, 18 insertions, 4 deletions
diff --git a/docker/trove/trove-api/Dockerfile.j2 b/docker/trove/trove-api/Dockerfile.j2 index 210dffa37..5ac79271a 100644 --- a/docker/trove/trove-api/Dockerfile.j2 +++ b/docker/trove/trove-api/Dockerfile.j2 @@ -16,8 +16,8 @@ MAINTAINER {{ maintainer }} {% endif %} -COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start +COPY extend_start.sh /usr/local/bin/kolla_trove_extend_start +RUN chmod 755 /usr/local/bin/kolla_trove_extend_start {% block trove_api_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/trove/trove-base/Dockerfile.j2 b/docker/trove/trove-base/Dockerfile.j2 index a946162dd..6f7bb9447 100644 --- a/docker/trove/trove-base/Dockerfile.j2 +++ b/docker/trove/trove-base/Dockerfile.j2 @@ -22,12 +22,16 @@ RUN ln -s trove-base-source/* trove \ && useradd --user-group trove \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /trove \ && mkdir -p /etc/trove /var/log/trove /home/trove \ - && cp -r /trove/etc/* /etc/trove/ \ + && cp -r /trove/etc/trove/* /etc/trove/ \ && chown -R trove: /etc/trove /var/log/trove /home/trove {% endif %} -RUN usermod -a -G kolla trove +COPY extend_start.sh /usr/local/bin/kolla_extend_start + +RUN usermod -a -G kolla trove \ + && touch /usr/local/bin/kolla_trove_extend_start \ + && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_trove_extend_start {% block trove_base_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/trove/trove-base/extend_start.sh b/docker/trove/trove-base/extend_start.sh new file mode 100644 index 000000000..581a83d7b --- /dev/null +++ b/docker/trove/trove-base/extend_start.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [[ ! -d "/var/log/kolla/trove" ]]; then + mkdir -p /var/log/kolla/trove +fi +if [[ $(stat -c %a /var/log/kolla/trove) != "755" ]]; then + chmod 755 /var/log/kolla/trove +fi + +. /usr/local/bin/kolla_trove_extend_start |