summaryrefslogtreecommitdiffhomepage
path: root/images
diff options
context:
space:
mode:
authorZach Koopmans <zkoopmans@google.com>2020-09-24 10:29:59 -0700
committergVisor bot <gvisor-bot@google.com>2020-09-24 10:32:01 -0700
commitc3fc69022afdbc1085c9b122a084168afa25cb80 (patch)
tree18a384dcb13a034522771dcae57d8d284da986d4 /images
parent0a7075f38a4870ded687e117a299ac4996c0673e (diff)
Fix Nginx Startup and Size Benchmarks.
Changes in Nginx Benchmarks in network_tests also affect Startup/Size Nginx Benchmarks. Make sure the commands line up. PiperOrigin-RevId: 333543697
Diffstat (limited to 'images')
-rw-r--r--images/benchmarks/nginx/Dockerfile1
-rw-r--r--images/benchmarks/nginx/nginx_gofer.conf19
2 files changed, 20 insertions, 0 deletions
diff --git a/images/benchmarks/nginx/Dockerfile b/images/benchmarks/nginx/Dockerfile
index 2444d04b1..c8e3330d0 100644
--- a/images/benchmarks/nginx/Dockerfile
+++ b/images/benchmarks/nginx/Dockerfile
@@ -9,3 +9,4 @@ RUN mkdir -p /local && \
RUN touch /local/index.html
COPY ./nginx.conf /etc/nginx/nginx.conf
+COPY ./nginx_gofer.conf /etc/nginx/nginx_gofer.conf
diff --git a/images/benchmarks/nginx/nginx_gofer.conf b/images/benchmarks/nginx/nginx_gofer.conf
new file mode 100644
index 000000000..dbba2a575
--- /dev/null
+++ b/images/benchmarks/nginx/nginx_gofer.conf
@@ -0,0 +1,19 @@
+user nginx;
+worker_processes 1;
+daemon off;
+
+error_log /var/log/nginx/error.log warn;
+pid /var/run/nginx.pid;
+
+events {
+ worker_connections 1024;
+}
+
+
+http {
+ server {
+ location / {
+ root /local;
+ }
+ }
+}