Fix HTTPD benchmarks to correctly serve files from /tmp.

Fixes #3113

PiperOrigin-RevId: 319216671
This commit is contained in:
Bhasker Hariharan
2020-07-01 06:58:56 -07:00
committed by gVisor bot
parent c9446f0534
commit b8f165ab1c
3 changed files with 11 additions and 5 deletions
+1
View File
@@ -9,5 +9,6 @@ pkg_tar(
name = "tar",
srcs = [
"Dockerfile",
"apache2-tmpdir.conf",
],
)
+5 -5
View File
@@ -6,16 +6,16 @@ RUN set -x \
apache2 \
&& rm -rf /var/lib/apt/lists/*
# Link the htdoc directory to tmp.
RUN mkdir -p /usr/local/apache2/htdocs && \
cd /usr/local/apache2 && ln -s /tmp htdocs
# Generate a bunch of relevant files.
RUN mkdir -p /local && \
for size in 1 10 100 1000 1024 10240; do \
dd if=/dev/zero of=/local/latin${size}k.txt count=${size} bs=1024; \
done
# Rewrite DocumentRoot to point to /tmp/html instead of the default path.
RUN sed -i 's/DocumentRoot.*\/var\/www\/html$/DocumentRoot \/tmp\/html/' /etc/apache2/sites-enabled/000-default.conf
COPY ./apache2-tmpdir.conf /etc/apache2/sites-enabled/apache2-tmpdir.conf
# Standard settings.
ENV APACHE_RUN_DIR /tmp
ENV APACHE_RUN_USER nobody
@@ -24,4 +24,4 @@ ENV APACHE_LOG_DIR /tmp
ENV APACHE_PID_FILE /tmp/apache.pid
# Copy on start-up; serve everything from /tmp (including the configuration).
CMD ["sh", "-c", "cp -a /local/* /tmp && apache2 -c \"ServerName localhost\" -c \"DocumentRoot /tmp\" -X"]
CMD ["sh", "-c", "mkdir -p /tmp/html && cp -a /local/* /tmp/html && apache2 -X"]
@@ -0,0 +1,5 @@
<Directory /tmp/html/>
Options Indexes FollowSymLinks
AllowOverride None
Require all granted
</Directory>