aboutsummaryrefslogtreecommitdiff
path: root/docker/kolla-toolbox
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>2023-03-27 16:55:04 +0200
committerMarcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>2023-04-21 14:13:24 +0200
commit19e40f160852a3519f3e58043b9b5555ca87f87d (patch)
tree6888eb38c08a5ee00a96fa63eb1f81c164667fb6 /docker/kolla-toolbox
parent2b0a5f684b80fcd85bfe12a51f899407e06741b8 (diff)
downloadkolla-19e40f160852a3519f3e58043b9b5555ca87f87d.tar.gz
kolla-19e40f160852a3519f3e58043b9b5555ca87f87d.zip
docker: implement macros to alter upper-constraints.txt
upper_constraints_remove() macro allows to remove line upper_constraints_version_change() allows to change versions This way we have cleaner way to alter u-c in those images which need it. Change-Id: I8fc354b8aa4d03fcd3ecfb9cbfe75de67492a0e3
Diffstat (limited to 'docker/kolla-toolbox')
-rw-r--r--docker/kolla-toolbox/Dockerfile.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index 073cc8f02..118cdf1f2 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -60,7 +60,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block kolla_toolbox_upper_constraints %}
RUN mkdir -p /requirements \
&& curl -o /requirements/upper-constraints.txt ${UPPER_CONSTRAINTS_FILE:-https://releases.openstack.org/constraints/upper/{{ openstack_release }}} \
- && sed -e "/^openstacksdk/d" -i /requirements/upper-constraints.txt \
+ && {{ macros.upper_constraints_remove("openstacksdk") }} \
&& {{ macros.install_pip(kolla_toolbox_pip_virtualenv_packages | customizable("pip_virtualenv_packages")) }} \
&& python3 -m venv --system-site-packages {{ virtualenv_path }}
{% endblock %}