diff options
| author | Maksim Malchuk <maksim.malchuk@gmail.com> | 2020-12-16 21:26:56 +0300 |
|---|---|---|
| committer | Maksim Malchuk <maksim.malchuk@gmail.com> | 2022-03-11 15:58:05 +0300 |
| commit | 83efe325462e683e2c99d088012cd611d7a0b138 (patch) | |
| tree | fa3d965238b19b976c705fd8c4ec68bd4ff945d3 /docker/base/Dockerfile.j2 | |
| parent | 5bb6489922aab2b431be8f121465eb7f3a49b5ae (diff) | |
| download | kolla-83efe325462e683e2c99d088012cd611d7a0b138.tar.gz kolla-83efe325462e683e2c99d088012cd611d7a0b138.zip | |
Unify curl use (customisation options)
This change adds and unifies an ability to override hardcoded URLs for
air-gapped environments via the usual blocks mechanism. Also, this
change replaces ENV with ARG instruction for the variables used only
in building images, and uses bash variable expansion where it possible.
This change is a continuation of the I46b77978926fc2b578a68d1aaa944b2198af0685
Change-Id: I1fbad333b1bc95484e6f4c5145d5936a0e2db84f
Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
Diffstat (limited to 'docker/base/Dockerfile.j2')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 4702fbd7a..fd18fa893 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -391,5 +391,12 @@ RUN touch /usr/local/bin/kolla_extend_start \ && chmod 2775 /var/log/kolla \ && rm -f /tmp/kolla_bashrc +{% block base_pip_conf %} +# the variables like PIP_INDEX_URL, PIP_EXTRA_INDEX_URL, PIP_TRUSTED_HOST etc. should be defined here. +# ENV PIP_INDEX_URL=https://pypi.python.org/simple +# ENV PIP_TRUSTED_HOST=pypi.python.org +# ENV UPPER_CONSTRAINTS_FILE=https://releases.openstack.org/constraints/upper/{{ openstack_release }} +{% endblock %} + {% block base_footer %}{% endblock %} CMD ["kolla_start"] |