diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2021-04-07 11:55:23 +0200 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2021-04-08 08:42:00 +0000 |
| commit | 56a570ddcdc287644e31c950f7591d355f61d6f4 (patch) | |
| tree | 24a0bc2cb8435bdaa1da6db327bb75cd385b0084 | |
| parent | 3251922dd517d114cf0a9e9a4a9fbac8d1bdb9fd (diff) | |
| download | kolla-56a570ddcdc287644e31c950f7591d355f61d6f4.tar.gz kolla-56a570ddcdc287644e31c950f7591d355f61d6f4.zip | |
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)
| -rw-r--r-- | docker/base/Dockerfile.j2 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 512024240..008f68f9d 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -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 %} |