diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7f5d1ff --- /dev/null +++ b/.gitignore @@ -0,0 +1,20 @@ +*/config/development +*/logs/log-*.php +!*/logs/index.html +*/cache/* +!system/cache/* +!*/cache/index.html +!*/cache/.htaccess + +user_guide_src/build/* +user_guide_src/cilexer/build/* +user_guide_src/cilexer/dist/* +user_guide_src/cilexer/pycilexer.egg-info/* + +#codeigniter 3 +application/logs/* +!application/logs/index.html +!application/logs/.htaccess +/vendor/ + +apache_log/* diff --git a/docker-compose.yml b/docker-compose.yml index aceb143..e5f3f93 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,7 @@ version: '3' services: merms-panel: + image: registry.chiefsoft.net/merms-panel:latest build: context: . dockerfile: docker/apache/Dockerfile