diff options
| author | Zuul <zuul@review.opendev.org> | 2021-04-08 00:03:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-04-08 00:03:11 +0000 |
| commit | 2b8ad5a4f099ff807997ba4314e2a3406204f5e1 (patch) | |
| tree | ef4f4d4f17c9bacf168b439e09b2efec3c33046b /docker | |
| parent | 73ac02898ab478e673bcc4e5bcac394d167e2542 (diff) | |
| parent | 4328a5b3cc0e90e32952ecfeab2b63407ee8e22a (diff) | |
| download | kolla-2b8ad5a4f099ff807997ba4314e2a3406204f5e1.tar.gz kolla-2b8ad5a4f099ff807997ba4314e2a3406204f5e1.zip | |
Merge "base: configure curl before first use"
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 49b7310f6..5d5bee4fc 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 @@ -412,7 +415,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 %} |