diff --git a/nginx/Dockerfile b/nginx/Dockerfile index bea8fa0..ef40178 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -28,7 +28,6 @@ ENV CONTAINERPILOT=/etc/containerpilot.json5 COPY reload-nginx.sh /bin/ COPY index.html /usr/share/nginx/html/ COPY style.css /usr/share/nginx/html/ -COPY nginx.conf /etc/nginx/nginx.conf COPY nginx.conf.ctmpl /etc/containerpilot/ EXPOSE 80 diff --git a/nginx/nginx.conf b/nginx/nginx.conf deleted file mode 100644 index 0175353..0000000 --- a/nginx/nginx.conf +++ /dev/null @@ -1,39 +0,0 @@ -daemon off; -user nginx; -worker_processes 1; - -error_log /var/log/nginx/error.log warn; -pid /var/run/nginx.pid; - -events { - worker_connections 1024; -} - - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /var/log/nginx/access.log main; - - sendfile on; - keepalive_timeout 65; - - server { - listen 80; - server_name _; - - root /usr/share/nginx/html; - - location /health { - # requires http_stub_status_module - stub_status; - allow 127.0.0.1; - deny all; - } - } -}