diff --git a/.docker/nginx/conf.d/http.conf b/.docker/nginx/conf.d/http.conf index 2d2e981..9d4c9b9 100644 --- a/.docker/nginx/conf.d/http.conf +++ b/.docker/nginx/conf.d/http.conf @@ -59,7 +59,7 @@ server { location ~ \.php$ { try_files $uri =404; fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php:9000; + fastcgi_pass akaunting.php:9000; fastcgi_index index.php; include fastcgi_params; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; diff --git a/.docker/nginx/conf.d/https.conf b/.docker/nginx/conf.d/https.conf index be8aeeb..81e80f9 100644 --- a/.docker/nginx/conf.d/https.conf +++ b/.docker/nginx/conf.d/https.conf @@ -70,7 +70,7 @@ server { location ~ \.php$ { try_files $uri =404; fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass php:9000; + fastcgi_pass akaunting.php:9000; fastcgi_index index.php; include fastcgi_params; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; diff --git a/docker-compose.yml b/docker-compose.yml index 3558944..56e1311 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,11 +1,3 @@ -networks: - internal: - driver: bridge - name: internal - external: - external: true - name: external - services: akaunting.php: build: .docker/php @@ -17,7 +9,7 @@ services: environment: - HOST_UID=${HOST_UID:-1000} - HOST_GID=${HOST_GID:-1000} - - AKAUNTING_VERSION=${AKAUNTING_VERSION:-3.1.11} + - AKAUNTING_VERSION=${AKAUNTING_VERSION:-3.1.21} - ADM_EMAIL=${ADM_EMAIL:-admin@test.domain} - ADM_PASSWD=${ADM_PASSWD:-admin} @@ -25,7 +17,7 @@ services: - DB_CONNECTION=${DB_CONNECTION:-mysql} - DB_PORT=${DB_PORT:-3306} - - DB_HOST=${DB_HOST:-mysql} + - DB_HOST=${DB_HOST:-akaunting.mysql} - DB_DATABASE=${DB_DATABASE:-akaunting} - DB_USERNAME=${DB_USERNAME:-root} - DB_PASSWORD=${DB_PASSWORD:-root} @@ -40,8 +32,6 @@ services: - XDEBUG_CONFIG extra_hosts: - host.docker.internal:host-gateway - networks: - - internal akaunting.nginx: build: context: .docker/nginx @@ -53,20 +43,14 @@ services: depends_on: - akaunting.php ports: - - 8082:80 - networks: - - internal - - external + - ${HTTP_PORT:-80}:80 akaunting.mysql: image: mysql volumes: - ./volumes/mysql/data:/var/lib/mysql - ./volumes/mysql/dump:/docker-entrypoint-initdb.d ports: - - 3307:3306 + - ${MYSQL_PORT:-3306}:3306 environment: - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-root} - MYSQL_DATABASE=${MYSQL_DATABASE:-akaunting} - networks: - - internal - - external