diff options
| author | Michał Nasiadka <mnasiadka@gmail.com> | 2020-12-02 18:46:53 +0100 |
|---|---|---|
| committer | Michał Nasiadka <mnasiadka@gmail.com> | 2020-12-02 18:48:22 +0100 |
| commit | 22c32a30e62d42c3631306775c0cd029eb659e9a (patch) | |
| tree | 2920e76c6d37859fa630eab8d01059cc04c06223 /docker/monasca | |
| parent | e0835803d7d3dcf5a33ffa2885275292ff5b6173 (diff) | |
| download | kolla-22c32a30e62d42c3631306775c0cd029eb659e9a.tar.gz kolla-22c32a30e62d42c3631306775c0cd029eb659e9a.zip | |
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.
Change-Id: I46b77978926fc2b578a68d1aaa944b2198af0685
Diffstat (limited to 'docker/monasca')
| -rw-r--r-- | docker/monasca/monasca-grafana/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/monasca/monasca-grafana/Dockerfile.j2 b/docker/monasca/monasca-grafana/Dockerfile.j2 index c76cbb98a..f752802db 100644 --- a/docker/monasca/monasca-grafana/Dockerfile.j2 +++ b/docker/monasca/monasca-grafana/Dockerfile.j2 @@ -56,7 +56,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 \ @@ -87,7 +87,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 \ |
