Skip to content

Commit 302f4a9

Browse files
hrwyoctozepto
authored andcommitted
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 4328a5b)
1 parent 36637f4 commit 302f4a9

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

docker/base/Dockerfile.j2

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ FROM {{ base_image }}:{{ base_distro_tag }}
33
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
44
{% endblock %}
55

6+
# We use curl in this dockerfile so let configure it before first use
7+
COPY curlrc /root/.curlrc
8+
69
{% block base_lang %}
710
# NOTE(yoctozepto): use a UTF-8 (Unicode) locale like standard image installs do
811
# fixes issues arising from ascii fallback usage
@@ -418,7 +421,6 @@ COPY start.sh /usr/local/bin/kolla_start
418421
COPY copy_cacerts.sh /usr/local/bin/kolla_copy_cacerts
419422
COPY httpd_setup.sh /usr/local/bin/kolla_httpd_setup
420423
COPY sudoers /etc/sudoers
421-
COPY curlrc /root/.curlrc
422424

423425
{% if use_dumb_init %}
424426

0 commit comments

Comments
 (0)