openstack
/
kolla
Code Issues Proposed changes

base: configure curl before first use 

We want to have all uses of curl behave the same so we ship config file
for it in all images.

So do it at start of image so 'base' makes use of config too.

Change-Id: I95aa64f0b292cd020574dbedd320ef90529cc7a4
(cherry picked from commit 4328a5b3cc)
This commit is contained in:
Marcin Juszkiewicz 2021-04-07 11:55:23 +02:00 committed by Radosław Piliszek
parent 3251922dd5
commit 56a570ddcd
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

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