docs/ci: default to port 80 for the caching proxy
Also use `caching-proxy` as a name which is automatically generated from `NFS_SERVER_IP`. Signed-off-by: David Heidelberg <david.heidelberg@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24445>
This commit is contained in:

committed by
Marge Bot

parent
57b0db63e1
commit
e389234a5e
@@ -224,7 +224,7 @@ Enable the site and restart nginx:
|
|||||||
wget http://localhost/cache/?uri=https://s3.freedesktop.org/mesa-tracie-public/itoral-gl-terrain-demo/demo.trace
|
wget http://localhost/cache/?uri=https://s3.freedesktop.org/mesa-tracie-public/itoral-gl-terrain-demo/demo.trace
|
||||||
|
|
||||||
Now, set ``download-url`` in your ``traces-*.yml`` entry to something like
|
Now, set ``download-url`` in your ``traces-*.yml`` entry to something like
|
||||||
``http://10.42.0.1:8888/cache/?uri=https://s3.freedesktop.org/mesa-tracie-public``
|
``http://caching-proxy/cache/?uri=https://s3.freedesktop.org/mesa-tracie-public``
|
||||||
and you should have cached downloads for traces. Add it to
|
and you should have cached downloads for traces. Add it to
|
||||||
``FDO_HTTP_CACHE_URI=`` in your ``config.toml`` runner environment lines and you
|
``FDO_HTTP_CACHE_URI=`` in your ``config.toml`` runner environment lines and you
|
||||||
can use it for cached artifact downloads instead of going all the way to
|
can use it for cached artifact downloads instead of going all the way to
|
||||||
|
@@ -1,9 +1,9 @@
|
|||||||
proxy_cache_path /var/cache/nginx/ levels=1:2 keys_zone=my_cache:10m max_size=24g inactive=48h use_temp_path=off;
|
proxy_cache_path /var/cache/nginx/ levels=1:2 keys_zone=my_cache:10m max_size=24g inactive=48h use_temp_path=off;
|
||||||
|
|
||||||
server {
|
server {
|
||||||
listen 10.42.0.1:8888 default_server;
|
listen 10.42.0.1:80 default_server;
|
||||||
listen 127.0.0.1:8888 default_server;
|
listen 127.0.0.1:80 default_server;
|
||||||
listen [::]:8888 default_server;
|
listen [::]:80 default_server;
|
||||||
resolver 8.8.8.8;
|
resolver 8.8.8.8;
|
||||||
|
|
||||||
root /var/www/html;
|
root /var/www/html;
|
||||||
|
Reference in New Issue
Block a user