From 00339ecc48e301727a648d9e9b0713bac13fefa8 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Wed, 7 Apr 2021 11:55:23 +0200
Subject: [PATCH] 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 4328a5b3cc0e90e32952ecfeab2b63407ee8e22a)
---
 docker/base/Dockerfile.j2 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 332b2e57cf..17300ed54c 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -3,6 +3,9 @@ FROM {{ base_image }}:{{ base_distro_tag }}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}
 
+# 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
@@ -429,7 +432,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 %}