diff --git a/Financial_Containers/invoiceshelf/compose.yaml b/Financial_Containers/invoiceshelf/compose.yaml index 84f17f1..bb35f51 100644 --- a/Financial_Containers/invoiceshelf/compose.yaml +++ b/Financial_Containers/invoiceshelf/compose.yaml @@ -11,44 +11,46 @@ services: - 5432:5432 volumes: - /srv/docker/invoiceshelf/postgres:/var/lib/postgresql/data + env_file: + - .env environment: - - POSTGRES_PASSWORD= + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} + - DB_PASSWORD=${DB_PASSWORD} - POSTGRES_USER=invoiceshelf - POSTGRES_DB=invoiceshelf - networks: - - invoiceshelf restart: unless-stopped invoiceshelf: - image: invoiceshelf/invoiceshelf:nightly + image: invoiceshelf/invoiceshelf:latest container_name: invoiceshelf - ports: - - 8092:80 + #ports: + # - 8092:80 volumes: - /srv/docker/invoiceshelf/invoiceshelf_pgsql/data:/data - /srv/docker/invoiceshelf/invoiceshelf_pgsql/conf:/conf - networks: - - invoiceshelf + env_file: + - .env environment: - PHP_TZ=America/Chicago - TIMEZONE=America/Chicago - - APP_NAME=Laravel - - APP_ENV=local + - APP_NAME=InvoiceShelf + - APP_ENV=production - APP_DEBUG=true - - APP_URL=http://localhost:8092 + - APP_URL=https://${SERVICE_NAME}.${DOMAIN_NAME} - DB_CONNECTION=pgsql - DB_HOST=invoiceshelf_db - DB_PORT=5432 - DB_DATABASE=invoiceshelf - DB_USERNAME=invoiceshelf - - DB_PASSWORD= + - DB_PASSWORD=${DB_PASSWORD} - CACHE_STORE=file - SESSION_DRIVER=file - SESSION_LIFETIME=120 - SESSION_ENCRYPT=false - SESSION_PATH=/ - - SESSION_DOMAIN=localhost - - SANCTUM_STATEFUL_DOMAINS=localhost:8092 + - SESSION_DOMAIN=${SERVICE_NAME}.${DOMAIN_NAME} + - SANCTUM_STATEFUL_DOMAINS=${SERVICE_NAME}.${DOMAIN_NAME} - STARTUP_DELAY=10 + - TRUSTED_PROXIES=* #- MAIL_DRIVER=smtp #- MAIL_HOST=smtp.mailtrap.io #- MAIL_PORT=2525 @@ -61,4 +63,6 @@ services: - invoiceshelf_db networks: - invoiceshelf: \ No newline at end of file + default: + external: true + name: nginx \ No newline at end of file