This commit is contained in:
2020-04-03 20:50:25 +02:00
parent ffa46edbb7
commit d90d608111
2 changed files with 6 additions and 13 deletions
+1
View File
@@ -5,3 +5,4 @@ wwwroot/html/*
wwwroot/html/.* wwwroot/html/.*
data/databasses/* data/databasses/*
data/databasses/.* data/databasses/.*
nginx/ssl/*
+5 -13
View File
@@ -3,6 +3,7 @@ version: '3.2'
services: services:
nginx: nginx:
name: "docker-nginx"
image: "${NGINX_VERSION}" image: "${NGINX_VERSION}"
ports: ports:
- 80:80 - 80:80
@@ -19,11 +20,11 @@ services:
restart: on-failure restart: on-failure
php-fpm: php-fpm:
# image: "${PHP_VERSION}" name: "docker-php"
image: "${PHP_VERSION}"
build: ./Docker/php-fpm/ build: ./Docker/php-fpm/
volumes: volumes:
- ./etc/php-fpm/php-fpm.ini:/usr/local/etc/php-fpm.ini - ./etc/php-fpm/php-fpm.ini:/usr/local/etc/php-fpm.ini
# - ./etc/php-fpm/crontabs:/etc/crontabs
- ./wwwroot:/var/www - ./wwwroot:/var/www
environment: environment:
ENABLE_CRONTAB: "true" ENABLE_CRONTAB: "true"
@@ -31,11 +32,9 @@ services:
restart: on-failure restart: on-failure
mysql: mysql:
name: "docker-mysql"
image: "${MYSQL_VERSION}" image: "${MYSQL_VERSION}"
# command: --default-authentication-plugin=mysql_native_password
volumes: volumes:
# - ./etc/mysql/my.cnf:/etc/my.cnf
# - ./etc/mysql/my.cnf.d:/etc/my.cnf.d
- ./data/mysql/databases:/var/lib/mysql - ./data/mysql/databases:/var/lib/mysql
environment: environment:
MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD} MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
@@ -44,6 +43,7 @@ services:
restart: on-failure restart: on-failure
phpmyadmin: phpmyadmin:
name: "docker-phpmyadmin"
image: "${PMA_VERSION}" image: "${PMA_VERSION}"
ports: ports:
- 8081:80 - 8081:80
@@ -53,11 +53,3 @@ services:
PMA_HOST: mysql PMA_HOST: mysql
TZ: ${TZ} TZ: ${TZ}
restart: on-failure restart: on-failure
# redis:
# image: "${REDIS_VERSION}"
# volumes:
# - ./data/redis/data:/data:rw
# environment:
# TZ: ${TZ}
# restart: on-failure