Merge branch 'nightly' into release/nightly/bin/ncproxy/0.12.0

next-hat · Jun 9, 2024 · 749ec3b · 749ec3b
2 parents 92915d9 + 3ef6020
commit 749ec3b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/bin/ncproxy/src/models/templates/http.conf b/bin/ncproxy/src/models/templates/http.conf
@@ -47,9 +47,9 @@ server {
     proxy_ssl_certificate_key     {{location.ssl.CertificateKey}};
     {% endif  %}
   }{% endfor %}{% endif %}
-  proxy_connect_timeout                   2s;
-  proxy_send_timeout                      2s;
-  proxy_read_timeout                      2s;
+  # proxy_connect_timeout                   2s;
+  # proxy_send_timeout                      2s;
+  # proxy_read_timeout                      2s;
   proxy_next_upstream                     error timeout;
   proxy_next_upstream_timeout             2s;
   proxy_next_upstream_tries               3;

diff --git a/scripts/install_dev_image.sh b/scripts/install_dev_image.sh
@@ -12,5 +12,5 @@ docker pull cockroachdb/cockroach:v24.1.0
 docker pull ghcr.io/next-hat/metrsd:0.5.4
 docker pull ghcr.io/next-hat/nanocl-get-started:latest
 docker pull ghcr.io/next-hat/nanocl-dev:dev
-docker buildx build --load --network host -t ndns:dev -f ./bin/ndns/Dockerfile .
-docker buildx build --load --network host -t nproxy:dev -f ./bin/nproxy/Dockerfile .
+docker buildx build --load -t ndns:dev -f ./bin/ndns/Dockerfile .
+docker buildx build --load -t nproxy:dev -f ./bin/nproxy/Dockerfile .