From 5771e5c1c75def81a4b578c153becea1af041296 Mon Sep 17 00:00:00 2001 From: kev Date: Tue, 2 Feb 2021 18:22:31 +0800 Subject: [PATCH] update nginx --- nginx/Dockerfile | 15 ---------- nginx/README.md | 45 +++------------------------- nginx/arm/Dockerfile | 15 ---------- nginx/arm/docker-compose.yml | 6 ++-- nginx/data/{ => conf.d}/default.conf | 0 nginx/data/ssl/.gitkeep | 0 nginx/docker-compose.yml | 4 +-- 7 files changed, 9 insertions(+), 76 deletions(-) delete mode 100644 nginx/Dockerfile delete mode 100644 nginx/arm/Dockerfile rename nginx/data/{ => conf.d}/default.conf (100%) create mode 100644 nginx/data/ssl/.gitkeep diff --git a/nginx/Dockerfile b/nginx/Dockerfile deleted file mode 100644 index 5000306..0000000 --- a/nginx/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# -# Dockerfile for nginx -# - -FROM alpine - -MAINTAINER kev - -RUN set -xe \ - && apk add --no-cache nginx \ - && mkdir -p /run/nginx - -EXPOSE 80 - -CMD ["nginx", "-g", "daemon off;"] diff --git a/nginx/README.md b/nginx/README.md index 63b1693..42b1887 100644 --- a/nginx/README.md +++ b/nginx/README.md @@ -17,9 +17,9 @@ nginx: ports: - "80:80" volumes: - - ./data/default.conf:/etc/nginx/default.conf + - ./data/conf.d:/etc/nginx/conf.d - ./data/html:/usr/share/nginx/html - restart: always + restart: unless-stopped ``` ## Reverse Proxy @@ -30,53 +30,16 @@ File: docker-compose.yml nginx: image: nginx:alpine volumes: - - ./data/default.conf:/etc/nginx/conf.d/default.conf + - ./data/conf.d:/etc/nginx/conf.d - ./data/ssl:/etc/nginx/ssl - ./data/htpasswd:/etc/nginx/htpasswd net: host - restart: always + restart: unless-stopped ``` > Password file can be generated by: >> `echo "username:$(openssl passwd -apr1 password)" >> data/htpasswd` -File: nginx.conf - -```nginx -user nginx; -worker_processes 4; - -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; - #tcp_nopush on; - - keepalive_timeout 65; - - #gzip on; - - include /etc/nginx/conf.d/*.conf; - include /etc/nginx/sites-enabled/*; -} -``` - File: default ```nginx diff --git a/nginx/arm/Dockerfile b/nginx/arm/Dockerfile deleted file mode 100644 index 6576184..0000000 --- a/nginx/arm/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# -# Dockerfile for nginx-arm -# - -FROM easypi/alpine-arm - -MAINTAINER EasyPi Software Foundation - -RUN set -xe \ - && apk add --no-cache nginx \ - && mkdir -p /run/nginx - -EXPOSE 80 - -CMD ["nginx", "-g", "daemon off;"] diff --git a/nginx/arm/docker-compose.yml b/nginx/arm/docker-compose.yml index eb1272e..e3c1a4f 100644 --- a/nginx/arm/docker-compose.yml +++ b/nginx/arm/docker-compose.yml @@ -1,7 +1,7 @@ nginx: - image: easypi/nginx-arm + image: arm32v7/nginx:alpine volumes: - - ./data/default.conf:/etc/nginx/conf.d/default.conf + - ./data/conf.d:/etc/nginx/conf.d - ./data/ssl:/etc/nginx/ssl net: host - restart: always + restart: unless-stopped diff --git a/nginx/data/default.conf b/nginx/data/conf.d/default.conf similarity index 100% rename from nginx/data/default.conf rename to nginx/data/conf.d/default.conf diff --git a/nginx/data/ssl/.gitkeep b/nginx/data/ssl/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/nginx/docker-compose.yml b/nginx/docker-compose.yml index c4b7263..97fb0c7 100644 --- a/nginx/docker-compose.yml +++ b/nginx/docker-compose.yml @@ -1,7 +1,7 @@ nginx: image: nginx:alpine volumes: - - ./data/default.conf:/etc/nginx/conf.d/default.conf + - ./data/conf.d:/etc/nginx/conf.d - ./data/ssl:/etc/nginx/ssl net: host - restart: always + restart: unless-stopped