ExternalVendorCode/devilbox
1
0
Fork 0
mirror of https://github.com/cytopia/devilbox.git synced 2025-04-27 14:29:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add new PHP container namespace

Browse Source
This commit is contained in:
cytopia 2018-03-05 21:50:02 +01:00
parent abb7b8dd5d
commit dcad1b2387
No known key found for this signature in database
GPG Key ID: 6D56EDB8695128A2
6 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.gitignore vendored
View File

@ -13,14 +13,11 @@
# CUSTOM # CUSTOM
###################################### ######################################
# Keep folders
!.keepme
# Ignore variable dat # Ignore variable dat
/.env /.env
/log/[a-z0-9-]* /log/[a-z0-9-]*
/data/ /data/*
/backups/ /backups/*
# Ignore custom HTTPD configs # Ignore custom HTTPD configs
/cfg/apache-2.2/*.conf /cfg/apache-2.2/*.conf
@ -64,6 +61,10 @@
!/bash/bashrc.sh-example !/bash/bashrc.sh-example
!/bash/README.md !/bash/README.md
# Keep folders
!.keepme
###################################### ######################################
# GENERIC # GENERIC
###################################### ######################################

0
backups/.keepme Normal file
View File

0
data/.keepme Normal file
View File

9
docker-compose.yml
View File

@ -63,7 +63,7 @@ services:
# PHP / HHVM # PHP / HHVM
# ------------------------------------------------------------ # ------------------------------------------------------------
php: php:
image: cytopia/${PHP_SERVER:-php-fpm-7.0}:latest image: devilbox/php-fpm:${PHP_SERVER:-7.0}-work
restart: always restart: always
## ##
@ -80,6 +80,7 @@ services:
## Debug? ## Debug?
## ##
- DEBUG_COMPOSE_ENTRYPOINT - DEBUG_COMPOSE_ENTRYPOINT
- DOCKER_LOGS=0
## ##
## UserID and GroupID ## UserID and GroupID
@ -136,7 +137,7 @@ services:
- ${HOST_PATH_HTTPD_DATADIR}:/shared/httpd - ${HOST_PATH_HTTPD_DATADIR}:/shared/httpd
# Mount logs # Mount logs
- ${DEVILBOX_PATH}/log/${PHP_SERVER}:/var/log/php - ${DEVILBOX_PATH}/log/php-fpm-${PHP_SERVER}:/var/log/php
# Mount Mail directory # Mount Mail directory
#- ${DEVILBOX_PATH}/run/mail:/var/mail #- ${DEVILBOX_PATH}/run/mail:/var/mail
@ -146,11 +147,11 @@ services:
# Mount devilbox user-defined *.ini files in order # Mount devilbox user-defined *.ini files in order
# to overwrite the default PHP configuration # to overwrite the default PHP configuration
- ${DEVILBOX_PATH}/cfg/${PHP_SERVER}:/etc/php-custom.d:ro - ${DEVILBOX_PATH}/cfg/php-fpm-${PHP_SERVER}:/etc/php-custom.d:ro
# Mount devilbox user-defined *.so files in order # Mount devilbox user-defined *.so files in order
# to load custom PHP modules # to load custom PHP modules
- ${DEVILBOX_PATH}/mod/${PHP_SERVER}:/usr/lib64/php/custom-modules:ro - ${DEVILBOX_PATH}/mod/php-fpm-${PHP_SERVER}:/usr/lib64/php/custom-modules:ro
# Mount devilbox user-defined bash config # Mount devilbox user-defined bash config
- ${DEVILBOX_PATH}/bash:/etc/bashrc-devilbox.d - ${DEVILBOX_PATH}/bash:/etc/bashrc-devilbox.d

2
env-example
View File

@ -172,7 +172,7 @@ DEVILBOX_UI_DISABLE=0
#PHP_SERVER=php-fpm-5.5 #PHP_SERVER=php-fpm-5.5
#PHP_SERVER=php-fpm-5.6 #PHP_SERVER=php-fpm-5.6
#PHP_SERVER=php-fpm-7.0 #PHP_SERVER=php-fpm-7.0
PHP_SERVER=php-fpm-7.1 PHP_SERVER=7.1
#PHP_SERVER=php-fpm-7.2 #PHP_SERVER=php-fpm-7.2
#PHP_SERVER=hhvm-latest #PHP_SERVER=hhvm-latest

3
shell.sh
View File

@ -1,4 +1,3 @@
#!/bin/sh #!/bin/sh
CWD="/shared/httpd" docker-compose exec --user devilbox php bash -l
docker-compose exec --user devilbox php env TERM=xterm /bin/sh -c "cd ${CWD}; exec bash -l"