diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2021-04-07 11:55:23 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2021-04-07 11:55:23 +0200 |
| commit | 4328a5b3cc0e90e32952ecfeab2b63407ee8e22a (patch) | |
| tree | 119f997d4f115d37cdea7fd83737c2a87773ecf6 /docker | |
| parent | 35affc9fd5102907a6a215e5bbc3cfc8bc26bf86 (diff) | |
| download | kolla-4328a5b3cc0e90e32952ecfeab2b63407ee8e22a.tar.gz kolla-4328a5b3cc0e90e32952ecfeab2b63407ee8e22a.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
Diffstat (limited to 'docker')
| -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 61b9d90e3..702b3b986 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 @@ -415,7 +418,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 %} |