Skip to content
This repository was archived by the owner on Mar 24, 2022. It is now read-only.

Commit

Permalink
Move repository location to PHP.earth
Browse files Browse the repository at this point in the history
  • Loading branch information
petk committed Jun 11, 2017
1 parent 474571f commit 5b545be
Show file tree
Hide file tree
Showing 11 changed files with 41 additions and 101 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file. This projec

## [UNREALEASED] 2017-01-01

* Repository location refactored
* PEAR removed
* PHP 7.2.0alpha1
* ...
Expand Down
80 changes: 10 additions & 70 deletions CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,74 +1,14 @@
# Contributor Covenant Code of Conduct
# Code of Conduct

## Our Pledge
This repository is part of the [PHP.earth](https://github.com/php-earth) organization.

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.
We make our best efforts to guarantee a safe, inclusive and harassment-free
environment 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
The latest and full version of the code of conduct is available on the
[PHP.earth website](https://php.earth/conduct).

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 peterkokot AT gmail.com. 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/
The project team maintains confidentiality with regard to the reporter of an
incident. In case of code of conduct violations, contact us at `conduct AT php.earth`.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ version (e.g. 1.x.y) is released by the following release process:

* **2. Tag a New Release**

Tag a new version on [GitHub](https://github.com/petk/docker-php/releases).
Tag a new version on [GitHub](https://github.com/php-earth/docker-php/releases).

* **3. Docker Images**

With a new tag release, Docker images are build automatically on
[Docker Hub](https://hub.docker.com/r/petk/php/).
[Docker Hub](https://hub.docker.com/r/phpearth/php/).
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2016-present Peter Kokot
Copyright (c) 2016-present PHP.earth

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
32 changes: 16 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Docker For PHP Developers

[![Docker Automated build](https://img.shields.io/docker/automated/jrottenberg/ffmpeg.svg)](https://hub.docker.com/r/petk/php/)
[![Docker Automated build](https://img.shields.io/docker/automated/jrottenberg/ffmpeg.svg)](https://hub.docker.com/r/phpearth/php/)

Customized Docker images crafted with care for various PHP tasks. Containing
PHP, Nginx and OpenLiteSpeed.
Expand All @@ -22,41 +22,41 @@ For official Docker PHP images visit [Docker Hub](https://hub.docker.com/_/php/)

### PHP 7.1

* [`latest` (*Dockerfile*)](https://github.com/petk/docker-php/tree/master/Dockerfile-7.1) - PHP CLI, Alpine
* [`litespeed` (*Dockerfile*)](https://github.com/petk/docker-php/tree/master/Dockerfile-7.1-litespeed) - OpenLiteSpeed, PHP LiteSpeed SAPI, Alpine
* [`litespeed-slim` (*Dockerfile*)](https://github.com/petk/docker-php/tree/master/Dockerfile-7.1-litespeed-slim) - OpenLiteSpeed, PHP LiteSpeed SAPI, Debian Jessie Slim
* [`nginx` (*Dockerfile*)](https://github.com/petk/docker-php/tree/master/Dockerfile-7.1-nginx) - Nginx, PHP FPM, Alpine
* [`nginx-slim` (*Dockerfile*)](https://github.com/petk/docker-php/tree/master/Dockerfile-7.1-nginx-slim) - PHP FPM, Nginx, Debian Jessie Slim
* [`latest` (*Dockerfile*)](https://github.com/php-earth/docker-php/tree/master/Dockerfile-7.1) - PHP CLI, Alpine
* [`litespeed` (*Dockerfile*)](https://github.com/php-earth/docker-php/tree/master/Dockerfile-7.1-litespeed) - OpenLiteSpeed, PHP LiteSpeed SAPI, Alpine
* [`litespeed-slim` (*Dockerfile*)](https://github.com/php-earth/docker-php/tree/master/Dockerfile-7.1-litespeed-slim) - OpenLiteSpeed, PHP LiteSpeed SAPI, Debian Jessie Slim
* [`nginx` (*Dockerfile*)](https://github.com/php-earth/docker-php/tree/master/Dockerfile-7.1-nginx) - Nginx, PHP FPM, Alpine
* [`nginx-slim` (*Dockerfile*)](https://github.com/php-earth/docker-php/tree/master/Dockerfile-7.1-nginx-slim) - PHP FPM, Nginx, Debian Jessie Slim

### PHP 7.2

* [`7.2` (*Dockerfile*)](https://github.com/petk/docker-php/tree/master/Dockerfile-7.2) - PHP CLI, Alpine
* [`7.2-litespeed` (*Dockerfile*)](https://github.com/petk/docker-php/tree/master/Dockerfile-7.2-litespeed) - OpenLiteSpeed, PHP LiteSpeed SAPI, Alpine
* [`7.2-litespeed-slim` (*Dockerfile*)](https://github.com/petk/docker-php/tree/master/Dockerfile-7.2-litespeed-slim) - OpenLiteSpeed, PHP LiteSpeed SAPI, Debian Jessie Slim
* [`7.2-nginx` (*Dockerfile*)](https://github.com/petk/docker-php/tree/master/Dockerfile-7.2-nginx) - Nginx, PHP FPM, Alpine
* [`7.2-nginx-slim` (*Dockerfile*)](https://github.com/petk/docker-php/tree/master/Dockerfile-7.2-nginx-slim) - PHP FPM, Nginx, Debian Jessie Slim
* [`7.2` (*Dockerfile*)](https://github.com/php-earth/docker-php/tree/master/Dockerfile-7.2) - PHP CLI, Alpine
* [`7.2-litespeed` (*Dockerfile*)](https://github.com/php-earth/docker-php/tree/master/Dockerfile-7.2-litespeed) - OpenLiteSpeed, PHP LiteSpeed SAPI, Alpine
* [`7.2-litespeed-slim` (*Dockerfile*)](https://github.com/php-earth/docker-php/tree/master/Dockerfile-7.2-litespeed-slim) - OpenLiteSpeed, PHP LiteSpeed SAPI, Debian Jessie Slim
* [`7.2-nginx` (*Dockerfile*)](https://github.com/php-earth/docker-php/tree/master/Dockerfile-7.2-nginx) - Nginx, PHP FPM, Alpine
* [`7.2-nginx-slim` (*Dockerfile*)](https://github.com/php-earth/docker-php/tree/master/Dockerfile-7.2-nginx-slim) - PHP FPM, Nginx, Debian Jessie Slim

## Quick Usage

Create a `Dockerfile` for your setup:

```Dockerfile
FROM petk/php:nginx
FROM phpearth/php:nginx
```

To run a CLI PHP script:

```bash
docker run -it --rm -v `pwd`:/usr/src/myapp -w /usr/src/myapp petk/php php script.php
docker run -it --rm -v `pwd`:/usr/src/myapp -w /usr/src/myapp phpearth/php php script.php
```

## Documentation

Check a more [extended documentation](https://github.com/petk/docker-php/tree/master/docs)
Check a more [extended documentation](https://github.com/php-earth/docker-php/tree/master/docs)
for additional information how to use these images and what's included.

## License and Contributing

[Contributions](https://github.com/petk/docker-php/blob/master/CONTRIBUTING.md)
[Contributions](https://github.com/php-earth/docker-php/blob/master/CONTRIBUTING.md)
are most welcome. This repository is released under the
[MIT license](https://github.com/petk/docker-php/blob/master/LICENSE).
[MIT license](https://github.com/php-earth/docker-php/blob/master/LICENSE).
1 change: 0 additions & 1 deletion docs/_config.yml

This file was deleted.

2 changes: 1 addition & 1 deletion docs/composer.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ build arguments. The following example uses Docker build arguments and the provi
`download-composer` script:

```Dockerfile
FROM petk/php:nginx
FROM phpearth/php:nginx

ARG APP_ENV=prod

Expand Down
2 changes: 1 addition & 1 deletion docs/php-extensions.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ install-php-ext {extension-name}
To install create a Dockerfile for your application and use the script in the following way:

```Dockerfile
FROM petk/php
FROM phpearth/php

RUN install-php-ext libsodium
```
Expand Down
2 changes: 1 addition & 1 deletion docs/recipes/nginx-alpine/.docker/app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM petk/php:nginx
FROM phpearth/php:nginx

RUN install-php-ext memcached

Expand Down
2 changes: 1 addition & 1 deletion docs/recipes/nginx-slim/.docker/app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM petk/php:nginx-slim
FROM phpearth/php:nginx-slim

RUN install-php-ext memcached

Expand Down
14 changes: 7 additions & 7 deletions docs/usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,42 +3,42 @@
Create a `Dockerfile` for your setup:

```bash
FROM petk/php
FROM phpearth/php
```

## Alpine

Alpine Nginx image:

```Dockerfile
FROM petk/php:nginx
FROM phpearth/php:nginx
```

## OpenLiteSpeed

For OpenLiteSpeed, create a Dockerfile:

```Dockerfile
FROM petk/php:litespeed
FROM phpearth/php:litespeed
```

## PHP CLI Script

To run a CLI PHP script:

```bash
docker run -it --rm --name my-cli-script -v "$PWD":/usr/src/myapp -w /usr/src/myapp petk/php php script.php
docker run -it --rm --name my-cli-script -v "$PWD":/usr/src/myapp -w /usr/src/myapp phpearth/php php script.php
```

Instead of `petk/php` you can also use `petk/php:litespeed`, `petk/php:nginx` or
`petk/php:nginx-slim`.
Instead of `phpearth/php` you can also use `phpearth/php:litespeed`, `phpearth/php:nginx` or
`phpearth/php:nginx-slim`.

## Install PHP Extensions

To install additional PHP extensions, use `install-php-ext` script:

```Dockerfile
FROM petk/php:nginx
FROM phpearth/php:nginx

RUN install-php-ext libsodium mcrypt soap
```
Expand Down

0 comments on commit 5b545be

Please sign in to comment.