aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Trefzer <benedikt.trefzer@cirrax.com>2016-04-05 22:48:45 +0200
committerBenedikt Trefzer <benedikt.trefzer@cirrax.com>2016-06-02 18:20:48 +0200
commit80d2edbd8e9e5468f7eaaec0a3630a1df5699139 (patch)
treedc6b43ad0a225e2c5210128ce2319875fce362cf
parent23d566a5e326185f98ddd76c0496ab182bf32751 (diff)
downloadkolla-80d2edbd8e9e5468f7eaaec0a3630a1df5699139.tar.gz
kolla-80d2edbd8e9e5468f7eaaec0a3630a1df5699139.zip
add curlrc file to base image
The curlrc file for root allows better output control for curl downloads during build process. Closes-Bug: #1567926 Change-Id: I19b526e4eab223d2456f4bbc2f4ba50192ec0901
-rw-r--r--docker/base/Dockerfile.j21
-rw-r--r--docker/base/curlrc4
2 files changed, 5 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 84a4fd374..0af20f7ca 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -221,6 +221,7 @@ RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 199369E540
COPY set_configs.py /usr/local/bin/kolla_set_configs
COPY start.sh /usr/local/bin/kolla_start
COPY sudoers /etc/sudoers
+COPY curlrc /root/.curlrc
RUN touch /usr/local/bin/kolla_extend_start \
&& chmod 755 /usr/local/bin/kolla_start /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_set_configs \
&& chmod 440 /etc/sudoers \
diff --git a/docker/base/curlrc b/docker/base/curlrc
new file mode 100644
index 000000000..903967b80
--- /dev/null
+++ b/docker/base/curlrc
@@ -0,0 +1,4 @@
+# curl default options
+--silent
+--show-error
+--write-out "curl (%{url_effective}): response: %{http_code}, time: %{time_total}, size: %{size_download}\n"