aboutsummaryrefslogtreecommitdiff
path: root/docker/cloudkitty
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>2022-04-21 18:21:42 +0200
committerRadosław Piliszek <radoslaw.piliszek@gmail.com>2022-04-21 18:53:14 +0000
commite21aeb5ae955671937055baf57836120af8d4312 (patch)
treec3a7bd5ab525f37e8b7a1d9f01864ab065e0ca05 /docker/cloudkitty
parent08b80e34dae0236e6b106e7debcdb755508fe1d9 (diff)
downloadkolla-e21aeb5ae955671937055baf57836120af8d4312.tar.gz
kolla-e21aeb5ae955671937055baf57836120af8d4312.zip
flatten images a bit
As we have one type of images now some RUN calls could be merged so we will have less layers in resulting images. Change-Id: I5178c58fbd8c65efe825dc249c0f1368ef0fe8e0
Diffstat (limited to 'docker/cloudkitty')
-rw-r--r--docker/cloudkitty/cloudkitty-base/Dockerfile.j210
1 files changed, 5 insertions, 5 deletions
diff --git a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-base/Dockerfile.j2
index adaa18c59..b10adb445 100644
--- a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2
+++ b/docker/cloudkitty/cloudkitty-base/Dockerfile.j2
@@ -14,15 +14,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %}
ADD cloudkitty-base-archive /cloudkitty-base-source
+
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+
RUN ln -s cloudkitty-base-source/* cloudkitty \
&& {{ macros.install_pip(cloudkitty_base_pip_packages | customizable("pip_packages")) }} \
&& mkdir -p /etc/cloudkitty \
&& cp -r /cloudkitty/etc/cloudkitty/* /etc/cloudkitty/ \
- && chown -R cloudkitty: /etc/cloudkitty
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN touch /usr/local/bin/kolla_cloudkitty_extend_start \
+ && chown -R cloudkitty: /etc/cloudkitty \
+ && touch /usr/local/bin/kolla_cloudkitty_extend_start \
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_cloudkitty_extend_start
{% block cloudkitty_base_footer %}{% endblock %}