Browse Source

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)
changes/29/785329/1
Marcin Juszkiewicz 1 week ago
committed by Radosław Piliszek
parent
commit
00339ecc48
1 changed files with 3 additions and 1 deletions
  1. +3
    -1
      docker/base/Dockerfile.j2

+ 3
- 1
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 }}"
{% 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 %}


Loading…
Cancel
Save