Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 81356d4

Browse files
committed
Fixes for new DockerHub organization 'phpcensor'.
1 parent 3fe0f9b commit 81356d4

File tree

6 files changed

+33
-36
lines changed

6 files changed

+33
-36
lines changed

‎README.md‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
# PHP Censor docker image
2-
![Image stars](https://img.shields.io/docker/stars/ket4yii/php-censor.svg)
3-
![Image pulls](https://img.shields.io/docker/pulls/ket4yii/php-censor.svg)
2+
![Web image stars](https://img.shields.io/docker/stars/phpcensor/php-censor-web.svg)
3+
![Worker image stars](https://img.shields.io/docker/stars/phpcensor/php-censor-worker.svg)
4+
![Web image pulls](https://img.shields.io/docker/pulls/phpcensor/php-censor-web.svg)
5+
![Web image pulls](https://img.shields.io/docker/pulls/phpcensor/php-censor-worker.svg)
46

57
## Description
68

7-
[Docker containers for PHP Censor](https://hub.docker.com/r/ket4yii/php-censor/) with installed, configured source code
9+
[Docker containers for PHP Censor](https://hub.docker.com/u/phpcensor/) with installed, configured source code
810
and dependencies, configurable by envs `config.yml`. It has separated into two containers parts: web and worker for
911
better scalability.
1012

11-
See [worker](https://github.com/ket4yii/docker-php-censor/tree/master/worker) and
12-
[web](https://github.com/ket4yii/docker-php-censor/tree/master/web) to get information about using. Or you can use
13+
See [worker](https://github.com/php-censor/docker-php-censor/tree/master/worker) and
14+
[web](https://github.com/php-censor/docker-php-censor/tree/master/web) to get information about using. Or you can use
1315
docker-compose file that is described below to run a whole stack.
1416

1517
## Docker compose

‎docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
version: '2.1'
22
services:
33
web:
4-
image: "ket4yii/php-censor:web"
4+
image: "phpcensor/php-censor-web:latest"
55
ports:
66
- "80:80"
77
env_file:
88
- ./env/phpcensor.env
99
worker:
10-
image: "ket4yii/php-censor:worker"
10+
image: "phpcensor/php-censor-worker:latest"
1111
env_file:
1212
- ./env/phpcensor.env
1313
db:

‎env/phpcensor.env‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@ BEANSTALK_HOST=beanstalk
66
BEANSTALK_QUEUE_NAME=phpcensor
77
DB_TYPE=pgsql
88
DB_PORT=5432
9-

‎web/README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ Sample run command (all needed containers like Beanstald, worker and database ar
1010

1111
```
1212
docker network create phpcensor
13-
docker run -d -p 8080:80 --net=phpcensor -e DB_HOST=db -e DB_USER=phpcensor -e DB_PASS=changeme -e DB_NAME=phpcensor -e SITE_URL=http://phpcensor.local -e BEANSTALK_HOST=beanstalk -e BEANSTALK_QUEUE_NAME=phpcensor ket4yii/php-censor:web
13+
docker run -d -p 8080:80 --net=phpcensor -e DB_HOST=db -e DB_USER=phpcensor -e DB_PASS=changeme -e DB_NAME=phpcensor -e SITE_URL=http://phpcensor.local -e BEANSTALK_HOST=beanstalk -e BEANSTALK_QUEUE_NAME=phpcensor phpcensor/php-censor-web
1414
```
1515

1616
Remember, this container is web-part and includes only FPM and Nginx, you should run database,
17-
Beanstalkd and [workers](https://github.com/ket4yii/docker-php-censor/tree/master/worker) to build your projects.
17+
Beanstalkd and [workers](https://github.com/php-censor/docker-php-censor/tree/master/worker) to build your projects.
1818

1919
### Configuration
2020

@@ -79,7 +79,6 @@ php-censor:
7979
port: $LDAP_PORT
8080
base_dn: $LDAP_BASE_DN
8181
mail_attribute: $LDAP_MAIL_ATTRIBUTE
82-
8382
```
8483

8584
And specify admin user by these variables:

‎web/nginx.conf‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,41 @@
1-
user nginx;
1+
user nginx;
22
worker_processes 4;
33

4-
pid /var/run/nginx.pid;
5-
4+
pid /var/run/nginx.pid;
65

76
events {
87
worker_connections 1024;
98
}
109

11-
1210
http {
13-
include mime.types;
14-
default_type application/octet-stream;
11+
include mime.types;
12+
default_type application/octet-stream;
1513

16-
sendfile on;
14+
sendfile on;
1715

18-
keepalive_timeout 65;
16+
keepalive_timeout 65;
1917

20-
gzip on;
18+
gzip on;
2119

2220
server {
2321
listen 80;
2422
server_name localhost;
25-
root /var/www/html/public;
23+
root /var/www/html/public;
2624

27-
error_log stderr;
25+
error_log stderr;
2826
access_log /dev/stdout;
2927

30-
location / {
31-
try_files $uri @php-censor;
28+
location / {
29+
try_files $uri @php-censor;
3230
}
3331

3432
location @php-censor {
35-
fastcgi_pass 127.0.0.1:9000;
36-
fastcgi_index index.php;
37-
fastcgi_buffers 256 4k;
38-
include fastcgi_params;
39-
fastcgi_param SCRIPT_FILENAME $document_root/index.php;
40-
fastcgi_param SCRIPT_NAME index.php;
33+
fastcgi_pass 127.0.0.1:9000;
34+
fastcgi_index index.php;
35+
fastcgi_buffers 256 4k;
36+
include fastcgi_params;
37+
fastcgi_param SCRIPT_FILENAME $document_root/index.php;
38+
fastcgi_param SCRIPT_NAME index.php;
4139
}
4240
}
43-
4441
}

‎worker/README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ Sample run command (all needed containers like Beanstald, web-part and database
1010

1111
```
1212
docker network create phpcensor
13-
docker run -d --net=phpcensor -e DB_HOST=db -e DB_USER=phpcensor -e DB_PASS=changeme -e DB_NAME=phpcensor -e BEANSTALK_HOST=beanstalk -e BEANSTALK_QUEUE_NAME=phpcensor ket4yii/php-censor:worker
13+
docker run -d --net=phpcensor -e DB_HOST=db -e DB_USER=phpcensor -e DB_PASS=changeme -e DB_NAME=phpcensor -e BEANSTALK_HOST=beanstalk -e BEANSTALK_QUEUE_NAME=phpcensor phpcensor/php-censor-worker
1414
```
1515

1616
Remember, this container is worker, you should run database,
17-
Beanstalkd and [web](https://github.com/ket4yii/docker-php-censor/tree/master/worker) to build your projects.
17+
Beanstalkd and [web](https://github.com/php-censor/docker-php-censor/tree/master/worker) to build your projects.
1818

1919
*Also you can install your own dependencies, like php-extensions or composer deps, at start time. See below text for further information.*
2020

@@ -101,15 +101,15 @@ You can install your dependencies from script. Just pass it by docker volume to
101101
CLI:
102102

103103
```
104-
docker run -d --net=phpcensor -v $PWD/my_install.sh:/docker-init.d/install.sh -e DB_HOST=db -e DB_USER=phpcensor -e DB_PASS=changeme -e DB_NAME=phpcensor -e BEANSTALK_HOST=beanstalk -e BEANSTALK_QUEUE_NAME=phpcensor ket4yii/php-censor:worker
104+
docker run -d --net=phpcensor -v $PWD/my_install.sh:/docker-init.d/install.sh -e DB_HOST=db -e DB_USER=phpcensor -e DB_PASS=changeme -e DB_NAME=phpcensor -e BEANSTALK_HOST=beanstalk -e BEANSTALK_QUEUE_NAME=phpcensor phpcensor/php-censor-worker
105105
```
106106

107107
docker-compose:
108108

109109
```
110110
...
111111
worker:
112-
image: ket4yii/php-censor:worker
112+
image: phpcensor/php-censor-worker
113113
volumes:
114114
- $PWD/my_install.sh:/docker-init.d/install.sh
115115
env_file:
@@ -122,5 +122,5 @@ worker:
122122
```
123123
docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/
124124
docker-php-ext-install -j$(grep -c ^processor /proc/cpuinfo) gd mysqli
125-
composer require ket4yii/phpci-deployer-plugin:^1.0
125+
composer require php-censor/php-censor-deployer-plugin:^1.0
126126
```

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /