-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: New release v1.21.4, better usage and documention for some stuff
- Added the latest mainline release for NGINX v1.21.4 - Modified the demo a bit by using a Docker demo file rather than mapping volumes - Minor adjustment to README and a real world sample - Minor editing to configuration files documentation
- Loading branch information
Omar Alsoudani
committed
Nov 3, 2021
1 parent
e67a197
commit b460297
Showing
9 changed files
with
80 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,21 @@ | ||
public/* linguist-generated | ||
# Automatically normalize line endings for all text-based files | ||
# https://git-scm.com/docs/gitattributes#_end_of_line_conversion | ||
|
||
* text=auto | ||
|
||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | ||
|
||
# Make GitHub's language statistics treat the `*.conf` files as | ||
# Nginx configuration files | ||
# | ||
# https://github.com/github/linguist/blob/master/README.md | ||
|
||
*.conf linguist-language=Nginx | ||
|
||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | ||
|
||
/.git* export-ignore | ||
/test export-ignore | ||
|
||
|
||
Dockerfile* linguist-language=Dockerfile |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
## This file is used for demo purpose only, check README for more details | ||
FROM omaralsoudani/nginx-brotli | ||
|
||
# COPY your NGINX configuration files to the container, and your servers in conf.d folder | ||
COPY ./conf/ /etc/nginx | ||
COPY ./conf.d/ /etc/nginx/conf.d | ||
|
||
# copy a demo page (index.html) for NGINX to serve inside public folder | ||
COPY ./public/ /usr/share/nginx/html | ||
|
||
# Start NGINX (the base image takes care of some things like docker STOPSIGNAL and using init as entrypoint) | ||
CMD ["nginx", "-g", "daemon off;"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,10 @@ | ||
version: "3.6" | ||
services: | ||
mk-nginx: | ||
image: omaralsoudani/nginx-brotli | ||
build: | ||
context: . | ||
dockerfile: Dockerfile.demo | ||
image: mk-nginx | ||
container_name: mk-nginx | ||
restart: unless-stopped | ||
network_mode: host | ||
volumes: | ||
- ./nginx.conf:/etc/nginx/nginx.conf | ||
- ./conf:/etc/nginx/extras | ||
- ./conf.d:/etc/nginx/conf.d | ||
- ./public:/usr/share/nginx/html | ||
network_mode: host |