Unify curl options

Currently we use couple of curl options throughout Dockerfiles, this change
adds all common options to curlrc (-sSLf) and removes usage of those in
Dockerfiles.

Also fixed conflicts added by I75927b6016bdb7577fbff354632bdab6407f359c
and I0bb8b2429906e698858f6b699e4c4d8bacc2dd74

Change-Id: I46b77978926fc2b578a68d1aaa944b2198af0685
(cherry picked from commit 22c32a3)
Signed-off-by: Maksim Malchuk <[email protected]>

Author: mnasiadka

docker/base/Dockerfile.j2

@@ -399,7 +399,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 %}

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"

docker/fluentd/Dockerfile.j2

@@ -107,7 +107,7 @@ RUN ln -s /bin/mkdir /usr/bin/mkdir
 ARG monasca_output_plugin_tag=1.0.1
 ARG monasca_output_plugin_url=https://github.com/monasca/fluentd-monasca/archive/$monasca_output_plugin_tag.tar.gz
 
-RUN curl -sSL $monasca_output_plugin_url -o /tmp/fluentd-monasca.tar.gz \
+RUN curl $monasca_output_plugin_url -o /tmp/fluentd-monasca.tar.gz \
     && tar -xvf /tmp/fluentd-monasca.tar.gz -C /tmp \
     && cd /tmp/fluentd-monasca-* \
 {%- if fluentd_user == 'fluentd' %}

docker/kafka/Dockerfile.j2

@@ -36,7 +36,7 @@ ENV kafka_pkg_sha512sum=9773a85ef2898b4bae20481df4cfd5488bd195fffd700fcc874a9fa5
 {% endblock %}
 
 {% block kafka_install %}
-RUN curl -sSL -o /tmp/kafka.tgz ${kafka_url} \
+RUN curl -o /tmp/kafka.tgz ${kafka_url} \
     && echo "${kafka_pkg_sha512sum} /tmp/kafka.tgz" | sha512sum -c \
     && tar --strip 1 -xvf /tmp/kafka.tgz -C /opt/kafka \
     && rm -f /tmp/kafka.tgz

docker/kolla-toolbox/Dockerfile.j2

@@ -71,7 +71,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% block kolla_toolbox_upper_constraints %}
 RUN mkdir -p /requirements \
-    && curl -sSL -o /requirements/upper-constraints.txt https://releases.openstack.org/constraints/upper/{{ openstack_release }} \
+    && curl -o /requirements/upper-constraints.txt https://releases.openstack.org/constraints/upper/{{ openstack_release }} \
     && {{ macros.install_pip(kolla_toolbox_pip_virtualenv_packages | customizable("pip_virtualenv_packages")) }} \
     && virtualenv --system-site-packages {{ virtualenv_path }}
 {% endblock %}

docker/mariadb/mariadb-clustercheck/Dockerfile.j2

@@ -20,7 +20,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.install_packages(mariadb_clustercheck_packages | customizable("packages")) }}
 
 {% if base_package_type == 'deb' %}
-RUN curl -sSL -o /usr/bin/clustercheck https://src.fedoraproject.org/rpms/mariadb/raw/10.3/f/clustercheck.sh \
+RUN curl -o /usr/bin/clustercheck https://src.fedoraproject.org/rpms/mariadb/raw/10.3/f/clustercheck.sh \
     && chmod 755 /usr/bin/clustercheck
 {% endif %}
 

docker/monasca/monasca-grafana/Dockerfile.j2

@@ -57,7 +57,7 @@ ARG monasca_grafana_app_url=https://github.com/monasca/monasca-grafana/archive/$
 # NPM installs itself in /usr/local/bin (the default in Ubuntu) which is not in the PATH.
 # This is forced for all distros to avoid conflicts with native packages.
 RUN gem install fpm \
-    && curl -sSL -o /tmp/monasca-grafana.tgz ${monasca_grafana_url} \
+    && curl -o /tmp/monasca-grafana.tgz ${monasca_grafana_url} \
     && mkdir -p ${monasca_grafana_build_path} \
     && tar --strip 1 -xvf /tmp/monasca-grafana.tgz -C ${monasca_grafana_build_path} \
     && rm -f /tmp/monasca-grafana.tgz \
@@ -88,7 +88,7 @@ RUN grafana-cli plugins install monasca-datasource \
     && chmod 755 /usr/local/bin/kolla_extend_start
 
 RUN mkdir -p /var/lib/grafana/plugins/monasca-grafana \
-    && curl -Lo tmp.tgz ${monasca_grafana_app_url} \
+    && curl -o tmp.tgz ${monasca_grafana_app_url} \
     && tar zxvf tmp.tgz -C /var/lib/grafana/plugins/monasca-grafana --strip-components=1 \
     && rm tmp.tgz \
     && npm install -g grunt \

docker/prometheus/prometheus-alertmanager/Dockerfile.j2

@@ -10,7 +10,7 @@ ENV prometheus_alertmanager_version=0.20.0
 {% endblock %}
 
 {% block prometheus_alertmanager_install %}
-RUN curl -sSL -o /tmp/prometheus_alertmanager.tar.gz https://github.com/prometheus/alertmanager/releases/download/v${prometheus_alertmanager_version}/alertmanager-${prometheus_alertmanager_version}.linux-{{debian_arch}}.tar.gz \
+RUN curl -o /tmp/prometheus_alertmanager.tar.gz https://github.com/prometheus/alertmanager/releases/download/v${prometheus_alertmanager_version}/alertmanager-${prometheus_alertmanager_version}.linux-{{debian_arch}}.tar.gz \
     && tar xvf /tmp/prometheus_alertmanager.tar.gz -C /opt/ \
     && rm -f /tmp/prometheus_alertmanager.tar.gz \
     && ln -s /opt/alertmanager* /opt/prometheus_alertmanager

docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2

@@ -24,7 +24,7 @@ ENV blackbox_exporter_version=0.16.0
 {{ macros.install_packages(blackbox_packages | customizable("packages")) }}
 
 {% block prometheus_blackbox_exporter_install %}
-RUN curl -sSL -o /tmp/blackbox_exporter.tar.gz https://github.com/prometheus/blackbox_exporter/releases/download/v${blackbox_exporter_version}/blackbox_exporter-${blackbox_exporter_version}.linux-{{debian_arch}}.tar.gz \
+RUN curl -o /tmp/blackbox_exporter.tar.gz https://github.com/prometheus/blackbox_exporter/releases/download/v${blackbox_exporter_version}/blackbox_exporter-${blackbox_exporter_version}.linux-{{debian_arch}}.tar.gz \
     && tar xvf /tmp/blackbox_exporter.tar.gz -C /opt/ \
     && rm -f /tmp/blackbox_exporter.tar.gz \
     && ln -s /opt/blackbox_exporter* /opt/blackbox_exporter

docker/prometheus/prometheus-cadvisor/Dockerfile.j2

@@ -14,7 +14,7 @@ ENV prometheus_cadvisor_version=0.35.0
 {% if base_arch in ['x86_64'] %}
 
 {% block prometheus_cadvisor_install %}
-RUN curl -ssL -o /opt/cadvisor https://github.com/google/cadvisor/releases/download/v${prometheus_cadvisor_version}/cadvisor && chmod 0755 /opt/cadvisor
+RUN curl -o /opt/cadvisor https://github.com/google/cadvisor/releases/download/v${prometheus_cadvisor_version}/cadvisor && chmod 0755 /opt/cadvisor
 {% endblock %}
 
 {% else %}