Skip to content

Commit

Permalink
Update setting.
Browse files Browse the repository at this point in the history
  • Loading branch information
chrishsieh committed Feb 12, 2019
1 parent cf06685 commit ab515cc
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
1 change: 0 additions & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ PHP_VER=7.3
#PHP_VER=5.5
#PHP_VER=5.4
#PHP_VER=5.3
#PHP_VER=5.2

## apache version
APACHE_VER=2.4
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
/.vagrant
/www
/log
/cert
11 changes: 10 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,17 @@ services:
MYSQL_USER_PWD: ${MYSQL_USER_PWD:-mysqlPWD}
MYSQL_USER_DB: ${MYSQL_USER_DB:-churchcrm}
FORWARD_PORTS_TO_LOCALHOST: '3306:mysql:3306, 80:apache:80, 443:apache:443'
# DOCKER_LOGS: 1
DOCKER_LOGS: 0
# DEBUG_RUNTIME: 1
# DEBUG_ENTRYPOINT: 1
entrypoint: ["bash", "-c", "/init.sh"]
volumes:
- ./www:/var/www/default
- ./crm_init.sh:/init.sh
## enabled by setting DOCKER_LOGS: 0
- ./log/php:/var/log/php
## used when enable email catch-all
- mail:/var/mail

apache:
container_name: apache
Expand All @@ -49,6 +53,7 @@ services:
PHP_FPM_SERVER_ADDR: php
PHP_FPM_SERVER_PORT: 9000
MAIN_VHOST_ENABLE: 1
MAIN_VHOST_SSL_GEN: 1
MAIN_VHOST_SSL_TYPE: both
MAIN_VHOST_SSL_CN: localhost
MAIN_VHOST_DOCROOT: churchcrm
Expand All @@ -58,11 +63,15 @@ services:
volumes:
- ./www:/var/www/default
## for keep certs
- ./cert:/etc/httpd/cert/main
- ca:/ca
- httpd:/shared/httpd
ports:
- "80:80"
- "443:443"

volumes:
mysql_data: null
ca: null
mail: null
httpd: null

0 comments on commit ab515cc

Please sign in to comment.