diff options
| author | Kristofer Hallin <kristofer@sunet.se> | 2021-11-17 11:00:39 +0100 |
|---|---|---|
| committer | Kristofer Hallin <kristofer@sunet.se> | 2021-11-17 11:07:41 +0100 |
| commit | ca5535c2ad8e05c0b50d4e764cc9602834e8b705 (patch) | |
| tree | e5bff326172fee6354c4b7387e9f038f9a658fcd | |
| parent | ab83f39bfc6f4d1422ab3be1d9d6d3d0422a235f (diff) | |
Use the official Nginx image.
| -rw-r--r-- | docker/nginx/Dockerfile | 13 | ||||
| -rw-r--r-- | docker/nginx/default.conf (renamed from docker/nginx/nginx.conf) | 0 | ||||
| -rw-r--r-- | docker/nginx/supervisord.conf | 9 |
3 files changed, 2 insertions, 20 deletions
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/nginx.conf b/docker/nginx/default.conf index a734b0e..a734b0e 100644 --- a/docker/nginx/nginx.conf +++ b/docker/nginx/default.conf 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 |