Browse Source

Merge "base: configure curl before first use"

changes/79/772479/16
Zuul 2 weeks ago
committed by Gerrit Code Review
parent
commit
2b8ad5a4f0
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
@ -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 %}


Loading…
Cancel
Save