Skip to content

Commit

Permalink
Fixed local docker development in docker-compose.yaml to use docker h…
Browse files Browse the repository at this point in the history
…ub image to fix php-fpm not starting #254
  • Loading branch information
givanz committed Jan 16, 2025
1 parent 3661080 commit aaecd9b
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 18 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
*
!php.ini
25 changes: 11 additions & 14 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ version: "3.8"

services:
db:
container_name: db
hostname: db
#image: mariadb:latest
image: mysql:latest
#command: --default-authentication-plugin=mysql_native_password
restart: always
Expand All @@ -16,9 +19,10 @@ services:
- internal

php:
build:
context: .
dockerfile: Dockerfile
#build:
#context: .
#dockerfile: Dockerfile
image: vvveb/vvvebcms:latest
environment:
VVVEB_HOST: db
VVVEB_PASSWORD: vvveb
Expand All @@ -29,6 +33,8 @@ services:
DB_ENGINE: mysqli
volumes:
- ./:/var/www/html/
ports:
- "8080:80"
links:
- db
depends_on:
Expand All @@ -53,17 +59,6 @@ services:
#networks:
#- internal

nginx:
image: nginx:alpine
ports:
- "8080:80"
volumes:
- ./:/var/www/html/
- ./nginx-docker.conf:/etc/nginx/conf.d/default.conf
depends_on:
- php
networks:
- internal

phpmyadmin:
image: phpmyadmin:latest
Expand All @@ -75,6 +70,8 @@ services:
- PMA_PASSWORD=vvveb
- PMA_HOST=db
- PMA_PORT=3306
links:
- db
depends_on:
- db
networks:
Expand Down
7 changes: 3 additions & 4 deletions php.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,15 @@ session.cookie_httponly = On
session.cookie_lifetime=0
session.gc_maxlifetime = 9999998
session.cookie_samesite="Strict"
session.sid_length="48"
session.sid_bits_per_character="6"
session.hash_function="sha256"
short_open_tag = Off
register_globals = Off
default_charset = UTF-8
mysql.connect_timeout = 10
memory_limit = 256M
max_execution_time = 60
upload_max_filesize = 50M
post_max_size = 10M
upload_max_filesize = 200M
post_max_size = 200M
allow_url_fopen = On
;extension=curl
;extension=gd
Expand Down

0 comments on commit aaecd9b

Please sign in to comment.