diff --git a/.travis.yml b/.travis.yml index 8f16fb6..8b64aae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ sudo: required branches: only: - - master - devel services: diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..82bd24c --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,74 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, gender identity and expression, level of experience, +nationality, personal appearance, race, religion, or sexual identity and +orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or +advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at admin@orleika.io. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at [http://contributor-covenant.org/version/1/4][version] + +[homepage]: http://contributor-covenant.org +[version]: http://contributor-covenant.org/version/1/4/ diff --git a/Dockerfile b/Dockerfile index b19f7bd..e845c20 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ FROM alpine:latest -MAINTAINER orleika +MAINTAINER orleika -ARG NGINX_VERSION=1.11.10 -ARG LIBRESSL_VERSION=2.5.1 +ARG NGINX_VERSION=1.11.12 +ARG LIBRESSL_VERSION=2.5.2 ARG GPG_LIBRESSL="A1EB 079B 8D3E B92B 4EBD 3139 663A F51B D5E4 D8D5" ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4 2178 520A 9993 A1C0 52F8" @@ -83,7 +83,6 @@ RUN addgroup -S nginx \ && rm -rf /tmp/* /root/.gnupg COPY nginx.conf /etc/nginx/nginx.conf -COPY log_format /etc/nginx/conf.d/log_format COPY default.conf /etc/nginx/sites-enabled/default.conf EXPOSE 80 443 diff --git a/README.md b/README.md index 5a78789..4b4edd9 100644 --- a/README.md +++ b/README.md @@ -1,26 +1,20 @@ -# docker-nginx +# Docker Nginx Image _(docker-nginx)_ -[![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://orleika.github.io/mit-license) [![Build Status](https://img.shields.io/travis/orleika/docker-nginx/master.svg?style=flat-square)](https://travis-ci.org/orleika/docker-nginx) -[![nginx](http://img.shields.io/badge/nginx-v1.11.10-blue.svg?style=flat-square)](https://nginx.org/en/download.html) +[![nginx](http://img.shields.io/badge/nginx-v1.11.12-blue.svg?style=flat-square)](https://nginx.org/en/download.html) [![LibreSSL](http://img.shields.io/badge/LibreSSL-v2.5.1-blue.svg?style=flat-square)](https://www.libressl.org/) -[![standard-readme compliant](https://img.shields.io/badge/standard--readme-OK-green.svg?style=flat-square)](https://github.com/RichardLitt/standard-readme) +[![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://orleika.github.io/mit-license) -> nginx docker image +> docker nginx image -Small-Secure-Fast nginx docker image. +Small-Secure-Fast docker nginx image. Base image is alpine, which is a security-oriented, lightweight Linux distribution. Most response headers are concealed, and DDoS mitigation is equipped. You should use secure headers included in `conf.d` for further safety considerations. Additionally, nginx caching parameters are optimized. This image is automatically released by Docker Cloud. -## Table of Contents - -- [Install](#install) -- [Usage](#usage) -- [Contribute](#contribute) -- [License](#license) - ## Install +This project uses [docker](https://docs.docker.com). Go check them out if you don't have them locally installed. + ```sh $ docker pull orleika/nginx ``` @@ -33,8 +27,9 @@ $ docker run -d -p 80:80 orleika/nginx ## Contribute -PRs accepted. +Please open [issues](https://github.com/orleika/docker-nginx/issues/new) or submit Pull requests to report bugs, features, or other problems. +Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. ## License -MIT © orleika +[MIT © orleika](LICENSE) diff --git a/log_format b/log_format deleted file mode 100644 index e69de29..0000000 diff --git a/nginx.conf b/nginx.conf index 7cd5e9b..79b1580 100644 --- a/nginx.conf +++ b/nginx.conf @@ -22,7 +22,6 @@ http { include /etc/nginx/mime.types; default_type application/octet-stream; - include /etc/nginx/conf.d/log_format; access_log /var/log/nginx/access.log combined; error_log /var/log/nginx/error.log crit;