openstack/kolla
Code Issues Proposed changes

Fix trove dockerfile

Browse Source 
change to kolla_extend_start to kolla_trove_extend_start
add extend_start.sh in trove dockerfile

Change-Id: Ifb12ef92d63bc0187f734da66642b016076bee10
Closes-Bug: #1641395
This commit is contained in:
zhubingbing
2016-11-13 11:49:21 +00:00
parent dbb0ade6d1
commit 6eccfe5897
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker/trove/trove-api/Dockerfile.j2
View File

@@ -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 %}

8
docker/trove/trove-base/Dockerfile.j2
View File

@@ -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 %}

10
docker/trove/trove-base/extend_start.sh Normal file
View File

@@ -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