From ca5535c2ad8e05c0b50d4e764cc9602834e8b705 Mon Sep 17 00:00:00 2001 From: Kristofer Hallin Date: Wed, 17 Nov 2021 11:00:39 +0100 Subject: Use the official Nginx image. --- docker/nginx/Dockerfile | 13 ++----------- docker/nginx/default.conf | 11 +++++++++++ docker/nginx/nginx.conf | 11 ----------- docker/nginx/supervisord.conf | 9 --------- 4 files changed, 13 insertions(+), 31 deletions(-) create mode 100644 docker/nginx/default.conf delete mode 100644 docker/nginx/nginx.conf delete mode 100644 docker/nginx/supervisord.conf (limited to 'docker/nginx') diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile index 9389b77..cc3dac8 100644 --- a/docker/nginx/Dockerfile +++ b/docker/nginx/Dockerfile @@ -1,13 +1,4 @@ -FROM debian:bullseye +FROM nginx -ENV DEBIAN_FRONTEND noninteractive - -RUN apt update -RUN apt install -y nginx supervisor emacs-nox procps -RUN apt clean - -COPY supervisord.conf /etc/supervisor/ -COPY nginx.conf /etc/nginx/sites-available/default - -ENTRYPOINT supervisord -c /etc/supervisor/supervisord.conf +COPY default.conf /etc/nginx/conf.d/default.conf diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf new file mode 100644 index 0000000..a734b0e --- /dev/null +++ b/docker/nginx/default.conf @@ -0,0 +1,11 @@ +server { + listen 80; + server_name _; + + access_log /var/log/nginx/access.log; + error_log /var/log/nginx/error.log warn; + + location / { + proxy_pass http://collector:8000; + } +} \ No newline at end of file diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf deleted file mode 100644 index a734b0e..0000000 --- a/docker/nginx/nginx.conf +++ /dev/null @@ -1,11 +0,0 @@ -server { - listen 80; - server_name _; - - access_log /var/log/nginx/access.log; - error_log /var/log/nginx/error.log warn; - - location / { - proxy_pass http://collector:8000; - } -} \ No newline at end of file diff --git a/docker/nginx/supervisord.conf b/docker/nginx/supervisord.conf deleted file mode 100644 index 32656b7..0000000 --- a/docker/nginx/supervisord.conf +++ /dev/null @@ -1,9 +0,0 @@ -[supervisord] -nodaemon=true - -[program:nginx] -command=/usr/sbin/nginx -g "daemon off;" -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 -- cgit v1.1