From 999ec4cae7cefbfc5ec62700c37858279a7e8dda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Pr=C3=B6schel?= Date: Thu, 21 Apr 2022 13:07:18 +0200 Subject: [PATCH] Bump Bazel to 5.1.1 --- .bazelrc | 2 +- .bazelversion | 2 +- frontend/start/nginx.conf | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.bazelrc b/.bazelrc index 5195a6668f..ef9aaf7c6a 100644 --- a/.bazelrc +++ b/.bazelrc @@ -3,7 +3,7 @@ build --strategy=TypeScriptCompile=worker # Use java 11 -build --java_toolchain=@bazel_tools//tools/jdk:toolchain_java11 --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_java11 +build --java_language_version=11 # Remove once annotation processing fix is released (https://github.com/bazelbuild/bazel/issues/12837) build --nojava_header_compilation diff --git a/.bazelversion b/.bazelversion index fcdb2e109f..ac14c3dfaa 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -4.0.0 +5.1.1 diff --git a/frontend/start/nginx.conf b/frontend/start/nginx.conf index 80c2029bca..02962c293f 100644 --- a/frontend/start/nginx.conf +++ b/frontend/start/nginx.conf @@ -8,11 +8,6 @@ events { worker_connections 1024; } -# By default nginx does not make any env variables accessible to lua -# http://nginx.org/en/docs/ngx_core_module.html#env -env API_HOST; -env CHATPLUGIN_HOST; - http { include /etc/nginx/mime.types; default_type application/octet-stream;