mirror of
https://github.com/nickyeoman/docker-compose-cookbooks.git
synced 2026-09-03 18:36:22 +00:00
mariadb, phpmyadmin, phpcontainer updates
This commit is contained in:
@@ -9,4 +9,4 @@ services:
|
|||||||
- MARIADB_USER=${MARIADB_MARIADB_USER:-dbuser}
|
- MARIADB_USER=${MARIADB_MARIADB_USER:-dbuser}
|
||||||
- MARIADB_PASSWORD=${MARIADB_MARIADB_PASSWORD:-AlsoChangeThisPassword}
|
- MARIADB_PASSWORD=${MARIADB_MARIADB_PASSWORD:-AlsoChangeThisPassword}
|
||||||
volumes:
|
volumes:
|
||||||
- ${VOL_PATH:-./data/}/mariadb_data:/var/lib/mysql
|
- ${VOL_PATH:-./data/}/mariadb:/var/lib/mysql
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
services:
|
services:
|
||||||
|
|
||||||
mariadb:
|
mariadb:
|
||||||
extends:
|
extends:
|
||||||
file: ${COOKBOOK}/mariadb/docker-compose.yml
|
file: ${COOKBOOK}/mariadb/docker-compose.yml
|
||||||
service: mariadb
|
service: mariadb
|
||||||
|
|
||||||
|
|||||||
+8
-5
@@ -1,10 +1,13 @@
|
|||||||
COOKBOOK=/git/docker-compose-cookbooks #HELP: cookbooks
|
# Global
|
||||||
VOL_PATH=./data/ #HELP: volpath
|
COOKBOOK=/docker-compose-cookbooks
|
||||||
TZ="America/Vancouver"
|
COMPOSE_PROJECT_NAME=project
|
||||||
|
TZ=America/Vancouver
|
||||||
|
VOL_CONFIG_PATH=/data/projectName/config
|
||||||
|
VOL_PATH=/data/projectName/data
|
||||||
|
|
||||||
# MariaDB
|
# MariaDB
|
||||||
MARIADB_IMAGE=mariadb:latest
|
MARIADB_IMAGE=mariadb:latest
|
||||||
MARIADB_MARIADB_DATABASE=mydb
|
MARIADB_MARIADB_DATABASE=mydb
|
||||||
MARIADB_MARIADB_PASSWORD=AlsoChangeThisPassword #HELP: gen32
|
MARIADB_MARIADB_ROOT_PASSWORD=ChangeThisPassword0123456789ABCD
|
||||||
MARIADB_MARIADB_ROOT_PASSWORD=ChangeThisPassword #HELP: gen32
|
MARIADB_MARIADB_PASSWORD=AlsoChangeThisPassword0123456789
|
||||||
MARIADB_MARIADB_USER=dbuser
|
MARIADB_MARIADB_USER=dbuser
|
||||||
|
|||||||
@@ -19,13 +19,14 @@ VOL_PATH=/project_dir/project/data
|
|||||||
Now using extend you can call the service:
|
Now using extend you can call the service:
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
version: '3.4'
|
|
||||||
|
|
||||||
services:
|
services:
|
||||||
stash:
|
|
||||||
|
php-apache:
|
||||||
extends:
|
extends:
|
||||||
file: ${COOKBOOK}/phpcontainer/docker-compose.yml
|
file: ${COOKBOOK}/phpcontainer/docker-compose.yml
|
||||||
service: php-apache
|
service: php-apache
|
||||||
env_file:
|
volumes:
|
||||||
- .env
|
- "./project:/data"
|
||||||
|
- "./config/php.ini:/usr/local/etc/php/php.ini"
|
||||||
|
|
||||||
```
|
```
|
||||||
@@ -7,4 +7,4 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- "./project:/data"
|
- "./project:/data"
|
||||||
- "./config/php.ini:/usr/local/etc/php/php.ini"
|
- "./config/php.ini:/usr/local/etc/php/php.ini"
|
||||||
|
|
||||||
|
|||||||
@@ -1,2 +1,9 @@
|
|||||||
PHPCONTAINER_IMAGE=4lights/phpcontainer:v4
|
# Global
|
||||||
VOL_PATH=/project-dir/project-name/data #HELP: volpath
|
COOKBOOK=/docker-compose-cookbooks
|
||||||
|
COMPOSE_PROJECT_NAME=project
|
||||||
|
TZ=America/Vancouver
|
||||||
|
VOL_CONFIG_PATH=/data/projectName/config
|
||||||
|
VOL_PATH=/data/projectName/data
|
||||||
|
|
||||||
|
# PHP Container
|
||||||
|
PHPCONTAINER_IMAGE=4lights/phpcontainer:latest
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
# Domains & Project
|
|
||||||
PREFIX=p1
|
|
||||||
PHPMYADMIN_DOMAIN_NAME=phpmyadmin.nickyeoman.com
|
|
||||||
|
|
||||||
# Software versions
|
|
||||||
PHPMYADMIN_V=5.0
|
|
||||||
@@ -1,8 +1,13 @@
|
|||||||
COOKBOOK=/git/docker-compose-cookbooks #HELP: cookbooks
|
COOKBOOK=/docker-compose-cookbooks
|
||||||
|
COMPOSE_PROJECT_NAME=phpmyadmin
|
||||||
|
TZ=America/Vancouver
|
||||||
|
VOL_CONFIG_PATH=/data/projectName/config
|
||||||
|
VOL_PATH=/data/projectName/data
|
||||||
|
|
||||||
# phpmyadmin
|
# phpmyadmin
|
||||||
PHPMYADMIN_IMAGE=phpmyadmin/phpmyadmin:latest
|
PHPMYADMIN_IMAGE=phpmyadmin/phpmyadmin:latest
|
||||||
PHPMYADMIN_PMA_ARBITRARY=1
|
PHPMYADMIN_PMA_ARBITRARY=1
|
||||||
PHPMYADMIN_PMA_HOST=mariadb
|
PHPMYADMIN_PMA_HOST=mariadb
|
||||||
PHPMYADMIN_PMA_USER=root
|
PHPMYADMIN_PMA_USER=root
|
||||||
PHPMYADMIN_PMA_PASSWORD=ChangeThisPassword
|
PHPMYADMIN_PMA_PASSWORD=ChangeThisPassword0123456789ABCD
|
||||||
PHPMYADMIN_UPLOAD_LIMIT=200M
|
PHPMYADMIN_UPLOAD_LIMIT=200M
|
||||||
|
|||||||
Reference in New Issue
Block a user