diff --git a/CHANGELOG b/CHANGELOG deleted file mode 100644 index 6aef345..0000000 --- a/CHANGELOG +++ /dev/null @@ -1,13 +0,0 @@ -# Change Log -All notable changes to this project will be documented in this file. - -## [1.1.2] - 2017-2-17 -### Added -- Bumped nginx version to 1.11.10 -- changed pull script to do composer install (container scripts 0.2.6) -- added --no-dev to composer install thx @SamMousa -- Moved to semver - -## [1.1.1] - 2017-2-14 -### Added -- Stable Release diff --git a/Dockerfile b/Dockerfile index 6bc4fe6..b19f86a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM php:7.1.8-fpm-alpine -MAINTAINER ngineered +MAINTAINER Ric Harvey ENV php_conf /usr/local/etc/php-fpm.conf ENV fpm_conf /usr/local/etc/php-fpm.d/www.conf diff --git a/README.md b/README.md index b5cbdc6..f0b0917 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ ![docker hub](https://img.shields.io/docker/pulls/richarvey/nginx-php-fpm.svg?style=flat-square) ![docker hub](https://img.shields.io/docker/stars/richarvey/nginx-php-fpm.svg?style=flat-square) -![Travis](https://img.shields.io/travis/ngineered/nginx-php-fpm.svg?style=flat-square) ## Overview This is a Dockerfile/image to build a container for nginx and php-fpm, with the ability to pull website code from git when the container is created, as well as allowing the container to push and pull changes to the code to and from git. The container also has the ability to update templated files with variables passed to docker in order to update your code and settings. There is support for lets encrypt SSL configurations, custom nginx configs, core nginx/PHP variable overrides for running preferences, X-Forwarded-For headers and UID mapping for local volume support. @@ -12,10 +11,10 @@ If you have improvements or suggestions please open an issue or pull request on |-----|-------|-----|--------|--------| | latest | Master Branch |1.13.4 | 7.1.8 | 3.4 | -For other tags please see: [versioning](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/versioning.md) +For other tags please see: [versioning](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/versioning.md) ### Links -- [https://github.com/ngineered/nginx-php-fpm](https://github.com/ngineered/nginx-php-fpm) +- [https://github.com/richarvey/nginx-php-fpm](https://github.com/richarvey/nginx-php-fpm) - [https://registry.hub.docker.com/u/richarvey/nginx-php-fpm/](https://registry.hub.docker.com/u/richarvey/nginx-php-fpm/) ## Quick Start @@ -38,29 +37,29 @@ You can then browse to ```http://``` to view the default install fi For more detailed examples and explanations please refer to the documentation. ## Documentation -- [Building from source](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/building.md) -- [Versioning](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/versioning.md) -- [Config Flags](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/config_flags.md) -- [Git Auth](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/git_auth.md) - - [Personal Access token](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/git_auth.md#personal-access-token) - - [SSH Keys](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/git_auth.md#ssh-keys) -- [Git Commands](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/git_commands.md) - - [Push](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/git_commands.md#push-code-to-git) - - [Pull](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/git_commands.md#pull-code-from-git-refresh) -- [Repository layout / webroot](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/repo_layout.md) - - [webroot](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/repo_layout.md#src--webroot) -- [User / Group Identifiers](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/UID_GID_Mapping.md) -- [Custom Nginx Config files](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/nginx_configs.md) - - [REAL IP / X-Forwarded-For Headers](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/nginx_configs.md#real-ip--x-forwarded-for-headers) -- [Scripting and Templating](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/scripting_templating.md) - - [Environment Variables](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/scripting_templating.md#using-environment-variables--templating) -- [Lets Encrypt Support](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/lets_encrypt.md) - - [Setup](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/lets_encrypt.md#setup) - - [Renewal](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/lets_encrypt.md#renewal) -- [PHP Modules](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/php_modules.md) -- [Xdebug](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/xdebug.md) -- [Logging and Errors](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/logs.md) +- [Building from source](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/building.md) +- [Versioning](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/versioning.md) +- [Config Flags](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/config_flags.md) +- [Git Auth](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/git_auth.md) + - [Personal Access token](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/git_auth.md#personal-access-token) + - [SSH Keys](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/git_auth.md#ssh-keys) +- [Git Commands](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/git_commands.md) + - [Push](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/git_commands.md#push-code-to-git) + - [Pull](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/git_commands.md#pull-code-from-git-refresh) +- [Repository layout / webroot](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/repo_layout.md) + - [webroot](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/repo_layout.md#src--webroot) +- [User / Group Identifiers](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/UID_GID_Mapping.md) +- [Custom Nginx Config files](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/nginx_configs.md) + - [REAL IP / X-Forwarded-For Headers](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/nginx_configs.md#real-ip--x-forwarded-for-headers) +- [Scripting and Templating](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/scripting_templating.md) + - [Environment Variables](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/scripting_templating.md#using-environment-variables--templating) +- [Lets Encrypt Support](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/lets_encrypt.md) + - [Setup](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/lets_encrypt.md#setup) + - [Renewal](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/lets_encrypt.md#renewal) +- [PHP Modules](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/php_modules.md) +- [Xdebug](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/xdebug.md) +- [Logging and Errors](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/logs.md) ## Guides -- [Running in Kubernetes](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/guides/kubernetes.md) -- [Using Docker Compose](https://github.com/ngineered/nginx-php-fpm/blob/master/docs/guides/docker_compose.md) +- [Running in Kubernetes](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/guides/kubernetes.md) +- [Using Docker Compose](https://github.com/richarvey/nginx-php-fpm/blob/master/docs/guides/docker_compose.md)