halo-battle/game
1
0
Fork 1
Code Issues Pull requests Projects Releases Activity

Ajout d'un readme et d'un docker-compose #2

Merged
nemunaire merged 3 commits from task/docker-compose into master 2020-11-21 23:17:43 +00:00
Conversation 1 Commits 3 Files changed 4 +6 -3
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit af280ac4fe - Show all commits

4
docker-compose.yml
View file

@ -7,7 +7,7 @@ networks:
services: services:
mariadb: mariadb:
restart: always restart: always
image: mariadb:10.5.8-focal image: mariadb:10-focal
nemunaire commented 2020-11-21 15:09:32 +00:00
Outdated
Copy link

idem image nginx, on a pas envie de gérer les versions spécifiques :

image: mariadb:10-focal
idem image nginx, on a pas envie de gérer les versions spécifiques : ```yaml image: mariadb:10-focal ```
networks: networks:
- halonet - halonet
volumes: volumes:
@ -41,7 +41,7 @@ services:
- DEV=true - DEV=true
nginx: nginx:
image: nginx:1.19.4-alpine image: nginx:1-alpine
nemunaire commented 2020-11-21 15:05:23 +00:00
Outdated
Copy link
image: nginx:1-alpine

Cela permettra d'éviter d'avoir à changer le docker-compose à chaque nouvelle version de nginx, 1-alpine devrait toujours marcher, connaissant nginx.

```yaml image: nginx:1-alpine ``` Cela permettra d'éviter d'avoir à changer le docker-compose à chaque nouvelle version de nginx, `1-alpine` devrait toujours marcher, connaissant `nginx`.
depends_on: depends_on:
- hb - hb
networks: networks:

5
nginx.conf
View file

@ -4,13 +4,16 @@ server {
root /usr/src/hb-main/htdocs; root /usr/src/hb-main/htdocs;
location / { location / {
try_files $uri $uri?$query_string /index.php?$query_string; index index.php;
nemunaire commented 2020-11-21 15:02:45 +00:00
Outdated
Copy link

Plutôt :

    index index.php;
    try_files $uri $uri/ /index.php;

Il n'y a pas besoin des $query_string pour nous.

Plutôt : ```conf index index.php; try_files $uri $uri/ /index.php; ``` Il n'y a pas besoin des `$query_string` pour nous.
try_files $uri $uri/ /index.php;
} }
location ~* \.php$ { location ~* \.php$ {
include fastcgi_params; include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
Nigel marked this conversation as resolved
nemunaire commented 2020-11-21 15:01:27 +00:00
Copy link

Il faudrait ajouter :

        fastcgi_param HTTP_HOST $server_name;
        fastcgi_param REMOTE_ADDR $remote_addr;
Il faudrait ajouter : ```conf fastcgi_param HTTP_HOST $server_name; fastcgi_param REMOTE_ADDR $remote_addr; ```
fastcgi_param SCRIPT_NAME $fastcgi_script_name; fastcgi_param SCRIPT_NAME $fastcgi_script_name;
fastcgi_param HTTP_HOST $server_name;
fastcgi_param REMOTE_ADDR $remote_addr;
fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_index index.php; fastcgi_index index.php;
fastcgi_pass hb:9000; fastcgi_pass hb:9000;