diff --git a/invoiceninja/docker-compose.yml b/invoiceninja/docker-compose.yml index 2f10a34..47c8113 100644 --- a/invoiceninja/docker-compose.yml +++ b/invoiceninja/docker-compose.yml @@ -4,23 +4,18 @@ services: image: nginx container_name: in_nginx restart: always + command: /bin/sh -c "rm -f /etc/nginx/conf.d/default.conf && nginx -g 'daemon off;'" env_file: .env volumes: - # Vhost configuration - #- ./config/caddy/Caddyfile:/etc/caddy/Caddyfiledocker-com - - ./config/nginx/in-vhost.conf:/etc/nginx/conf.d/in-vhost.conf:ro - - ./data/public:/var/www/app/public:ro + - /srv/invoiceninja/config/nginx/in-vhost.conf:/etc/nginx/conf.d/in-vhost.conf:ro + - /srv/invoiceninja/docker/app/public:/var/www/app/public:ro depends_on: - app - # Run webserver nginx on port 80 - # Feel free to modify depending what port is already occupied - ports: - - "80:80" - #- "443:443" + expose: + - "80" networks: - invoiceninja - extra_hosts: - - "in5.localhost:127.0.0.1" #host and ip + - proxy app: image: invoiceninja/invoiceninja:5 @@ -28,38 +23,27 @@ services: env_file: .env restart: always volumes: - - ./config/hosts:/etc/hosts:ro - - ./data/public:/var/www/app/public:rw,delegated - - ./data/storage:/var/www/app/storage:rw,delegated - - ./config/php/php.ini:/usr/local/etc/php/php.ini - - ./config/php/php-cli.ini:/usr/local/etc/php/php-cli.ini - + - /srv/invoiceninja/config/hosts:/etc/hosts:ro + - /srv/invoiceninja/docker/app/public:/var/www/app/public:rw,delegated + - /srv/invoiceninja/docker/app/storage:/var/www/app/storage:rw,delegated + - /srv/invoiceninja/config/php/php.ini:/usr/local/etc/php/php.ini + - /srv/invoiceninja/config/php/php-cli.ini:/usr/local/etc/php/php-cli.ini depends_on: - db networks: - invoiceninja - extra_hosts: - - "in5.localhost:127.0.0.1" #host and ip db: - image: mariadb:10.4 + image: mysql:8.4.0-oraclelinux8 container_name: in_mysql - ports: - - "3305:3306" restart: always env_file: .env volumes: - - ./mysql/data:/var/lib/mysql:rw,delegated - - # remove comments for next 4 lines if you want auto sql backups - #- ./mysql/bak:/backups:rw - #- ./config/mysql/backup-script:/etc/cron.daily/daily:ro - #- ./config/mysql/backup-script:/etc/cron.weekly/weekly:ro - #- ./config/mysql/backup-script:/etc/cron.monthly/monthly:ro + - /srv/invoiceninja/docker/mysql/data:/var/lib/mysql:rw,delegated networks: - invoiceninja - extra_hosts: - - "in5.localhost:127.0.0.1" #host and ip networks: - invoiceninja: \ No newline at end of file + invoiceninja: + proxy: + external: true