aboutsummaryrefslogtreecommitdiff
path: root/docker/base
diff options
context:
space:
mode:
Diffstat (limited to 'docker/base')
-rw-r--r--docker/base/Dockerfile.j24
-rw-r--r--docker/base/curlrc2
2 files changed, 4 insertions, 2 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 799847183..11da4e7a6 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -393,7 +393,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
{% endif -%}
{% endfor %}
{% for key in remote_apt_keys | customizable('remote_apt_keys') %}
- {%- if loop.first %} RUN {% else %} && {% endif %}curl -L {{ key }} | apt-key add -
+ {%- if loop.first %} RUN {% else %} && {% endif %}curl {{ key }} | apt-key add -
{%- if not loop.last %} \
{% endif -%}
{% endfor %}
@@ -427,7 +427,7 @@ COPY curlrc /root/.curlrc
{% block dumb_init_installation %}
-RUN curl -sSL https://github.com/Yelp/dumb-init/releases/download/v1.2.2/dumb-init_1.2.2_{{debian_arch}} -o /usr/local/bin/dumb-init \
+RUN curl https://github.com/Yelp/dumb-init/releases/download/v1.2.2/dumb-init_1.2.2_{{debian_arch}} -o /usr/local/bin/dumb-init \
&& chmod +x /usr/local/bin/dumb-init
{% endblock %}
diff --git a/docker/base/curlrc b/docker/base/curlrc
index 903967b80..c1c1303e8 100644
--- a/docker/base/curlrc
+++ b/docker/base/curlrc
@@ -1,4 +1,6 @@
# curl default options
+--fail
+--location
--silent
--show-error
--write-out "curl (%{url_effective}): response: %{http_code}, time: %{time_total}, size: %{size_download}\n"