diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-03 06:12:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-03 06:12:25 +0000 |
| commit | dd61d223de55a021d5ead95224e70badf9950a69 (patch) | |
| tree | e99ee5961e24f436bf2dd7fd156c7e085d137461 /docker | |
| parent | 98268db8bb15f428d845b0a76053b1c64291e4ab (diff) | |
| parent | 80d2edbd8e9e5468f7eaaec0a3630a1df5699139 (diff) | |
| download | kolla-dd61d223de55a021d5ead95224e70badf9950a69.tar.gz kolla-dd61d223de55a021d5ead95224e70badf9950a69.zip | |
Merge "add curlrc file to base image"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/base/curlrc | 4 |
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" |