Skip to content

armgit / Vvveb

Public Imported from GitHub
0

Powerful and easy to use cms to build websites, blogs or ecommerce stores.

Fixed local docker development in docker-compose.yaml to use docker hub image to fix php-fpm not starting https://github.com/givanz/Vvveb/issues/254

givanzaaecd9bae0f0
diff --git a/.dockerignore b/.dockerignore
index 72e8ffc..6f01688 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1 +1,2 @@
*
+!php.ini
diff --git a/docker-compose.yaml b/docker-compose.yaml
index c8a5341..79ea492 100755
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -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
@@ -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
@@ -29,6 +33,8 @@ services:
DB_ENGINE: mysqli
volumes:
- ./:/var/www/html/
+ ports:
+ - "8080:80"
links:
- db
depends_on:
@@ -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
@@ -75,6 +70,8 @@ services:
- PMA_PASSWORD=vvveb
- PMA_HOST=db
- PMA_PORT=3306
+ links:
+ - db
depends_on:
- db
networks:
diff --git a/php.ini b/php.ini
index 76ca29e..9335430 100755
--- a/php.ini
+++ b/php.ini
@@ -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