openstack
/
kolla
Code Issues Proposed changes

Merge "base: configure curl before first use"

This commit is contained in:
Zuul 2021-04-08 00:03:11 +00:00 committed by Gerrit Code Review
parent 73ac02898a 4328a5b3cc
commit 2b8ad5a4f0
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/base/Dockerfile.j2
View File

@ -3,6 +3,9 @@ FROM {{ base_image }}:{{ base_distro_tag }}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
{% endblock %} {% endblock %}
# We use curl in this dockerfile so let configure it before first use
COPY curlrc /root/.curlrc
{% block base_lang %} {% block base_lang %}
# NOTE(yoctozepto): use a UTF-8 (Unicode) locale like standard image installs do # NOTE(yoctozepto): use a UTF-8 (Unicode) locale like standard image installs do
# fixes issues arising from ascii fallback usage # fixes issues arising from ascii fallback usage
@ -412,7 +415,6 @@ COPY start.sh /usr/local/bin/kolla_start
COPY copy_cacerts.sh /usr/local/bin/kolla_copy_cacerts COPY copy_cacerts.sh /usr/local/bin/kolla_copy_cacerts
COPY httpd_setup.sh /usr/local/bin/kolla_httpd_setup COPY httpd_setup.sh /usr/local/bin/kolla_httpd_setup
COPY sudoers /etc/sudoers COPY sudoers /etc/sudoers
COPY curlrc /root/.curlrc
{% if use_dumb_init %} {% if use_dumb_init %}