aboutsummaryrefslogtreecommitdiff
path: root/docker/trove
diff options
context:
space:
mode:
Diffstat (limited to 'docker/trove')
-rw-r--r--docker/trove/trove-base/Dockerfile.j29
1 files changed, 4 insertions, 5 deletions
diff --git a/docker/trove/trove-base/Dockerfile.j2 b/docker/trove/trove-base/Dockerfile.j2
index 92baa5640..af3bde530 100644
--- a/docker/trove/trove-base/Dockerfile.j2
+++ b/docker/trove/trove-base/Dockerfile.j2
@@ -15,15 +15,14 @@ ADD trove-base-archive /trove-base-source
'/trove'
] %}
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+
RUN ln -s trove-base-source/* trove \
&& {{ macros.install_pip(trove_base_pip_packages | customizable("pip_packages")) }} \
&& mkdir -p /etc/trove \
&& cp -r /trove/etc/trove/* /etc/trove/ \
- && chown -R trove: /etc/trove
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN touch /usr/local/bin/kolla_trove_extend_start \
+ && chown -R trove: /etc/trove \
+ && touch /usr/local/bin/kolla_trove_extend_start \
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_trove_extend_start
{% block trove_base_footer %}{% endblock %}