mirror of
https://github.com/vichan-devel/vichan.git
synced 2024-11-24 07:30:10 +01:00
docker: prepare compose for multiple test instances
This commit is contained in:
parent
024f955338
commit
c3619c49fb
@ -1,4 +1,4 @@
|
|||||||
**/.git
|
**/.git
|
||||||
**/.gitignore
|
**/.gitignore
|
||||||
/local-www
|
/local-instances
|
||||||
**/.gitkeep
|
**/.gitkeep
|
||||||
|
2
.gitignore
vendored
2
.gitignore
vendored
@ -44,6 +44,6 @@ Thumbs.db
|
|||||||
#vichan custom
|
#vichan custom
|
||||||
favicon.ico
|
favicon.ico
|
||||||
/static/spoiler.png
|
/static/spoiler.png
|
||||||
local-www
|
/local-instances
|
||||||
|
|
||||||
/vendor/
|
/vendor/
|
||||||
|
@ -9,7 +9,7 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
volumes:
|
volumes:
|
||||||
- ./local-www:/var/www/html
|
- ./local-instances/1/www:/var/www/html
|
||||||
- ./docker/nginx/vichan.conf:/etc/nginx/conf.d/default.conf
|
- ./docker/nginx/vichan.conf:/etc/nginx/conf.d/default.conf
|
||||||
- ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf
|
- ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf
|
||||||
- ./docker/nginx/proxy.conf:/etc/nginx/conf.d/proxy.conf
|
- ./docker/nginx/proxy.conf:/etc/nginx/conf.d/proxy.conf
|
||||||
@ -21,7 +21,7 @@ services:
|
|||||||
context: .
|
context: .
|
||||||
dockerfile: ./docker/php/Dockerfile
|
dockerfile: ./docker/php/Dockerfile
|
||||||
volumes:
|
volumes:
|
||||||
- ./local-www:/var/www
|
- ./local-instances/1/www:/var/www
|
||||||
- ./docker/php/www.conf:/usr/local/etc/php-fpm.d/www.conf
|
- ./docker/php/www.conf:/usr/local/etc/php-fpm.d/www.conf
|
||||||
- ./docker/php/jit.ini:/usr/local/etc/php/conf.d/jit.ini
|
- ./docker/php/jit.ini:/usr/local/etc/php/conf.d/jit.ini
|
||||||
|
|
||||||
@ -36,3 +36,5 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
MYSQL_DATABASE: vichan
|
MYSQL_DATABASE: vichan
|
||||||
MYSQL_ROOT_PASSWORD: password
|
MYSQL_ROOT_PASSWORD: password
|
||||||
|
volumes:
|
||||||
|
- ./local-instances/1/mysql:/var/lib/mysql
|
||||||
|
@ -2,3 +2,15 @@ The `php-fpm` process runs containerized.
|
|||||||
The php application always uses `/var/www` as it's work directory and home folder, and if `/var/www` is bind mounted it
|
The php application always uses `/var/www` as it's work directory and home folder, and if `/var/www` is bind mounted it
|
||||||
is necessary to adjust the path passed via FastCGI to `php-fpm` by changing the root directory to `/var/www`.
|
is necessary to adjust the path passed via FastCGI to `php-fpm` by changing the root directory to `/var/www`.
|
||||||
This can achieved in nginx by setting the `fastcgi_param SCRIPT_FILENAME` to `/var/www/$fastcgi_script_name;`
|
This can achieved in nginx by setting the `fastcgi_param SCRIPT_FILENAME` to `/var/www/$fastcgi_script_name;`
|
||||||
|
|
||||||
|
The default docker compose settings are intended for development and testing purposes.
|
||||||
|
The folder structure expected by compose is as follows
|
||||||
|
|
||||||
|
```
|
||||||
|
<vichan-project>
|
||||||
|
└── local-instances
|
||||||
|
└── 1
|
||||||
|
├── mysql
|
||||||
|
└── www
|
||||||
|
```
|
||||||
|
The vichan container is by itself much less rigid.
|
||||||
|
Loading…
Reference in New Issue
Block a user