diff --git a/dist/docker/linux-x64/docker-compose.yml b/dist/docker/linux-x64/docker-compose.yml index 78420bb0..c2702632 100644 --- a/dist/docker/linux-x64/docker-compose.yml +++ b/dist/docker/linux-x64/docker-compose.yml @@ -15,6 +15,7 @@ services: ayanova: image: gztw/ayanova:v8.0.0 + init: true restart: always ports: - 7575:7575 @@ -22,12 +23,13 @@ services: - /var/lib:/var/lib environment: AYANOVA_USE_URLS: http://*:7575 - AYANOVA_DB_CONNECTION: User ID=postgres;Password=letmein;Host=postgresserver;Port=5432;Database=AyaNova;Pooling=true; + AYANOVA_DB_CONNECTION: User ID=postgres;Password=letmein;Host=postgresserver;Port=5432;Database=AyaNova;Pooling=true;CommandTimeout=90; AYANOVA_FOLDER_USER_FILES: /var/lib/ayanova/files/user AYANOVA_FOLDER_BACKUP_FILES: /var/lib/ayanova/files/backup AYANOVA_FOLDER_TEMPORARY_SERVER_FILES: /var/lib/ayanova/files/temp AYANOVA_LOG_PATH: /var/lib/ayanova AYANOVA_LOG_LEVEL: Info + #AYANOVA_REPORT_RENDERING_TIMEOUT: 5000 #AYANOVA_PERMANENTLY_ERASE_DATABASE: "true" build: context: ./ayanovadocker diff --git a/dist/docker/linux-x64/docker-compose.yml.original.b4.metrics b/dist/docker/linux-x64/docker-compose.yml.original.b4.metrics deleted file mode 100644 index 06dd6c2f..00000000 --- a/dist/docker/linux-x64/docker-compose.yml.original.b4.metrics +++ /dev/null @@ -1,41 +0,0 @@ -version: '2' - -services: - - postgresserver: - image: postgres:alpine - restart: always - ports: - - 5432:5432 - environment: - POSTGRES_PASSWORD: letmein - volumes: - - /var/lib/ayanova/db:/var/lib/postgresql/data - - ayanova: - image: gztw/ayanova:v8.0.0 - restart: always - ports: - - 7575:7575 - volumes: - - /var/lib:/var/lib - environment: - AYANOVA_USE_URLS: http://*:7575 - AYANOVA_DB_CONNECTION: User ID=postgres;Password=letmein;Host=postgresserver;Port=5432;Database=AyaNova;Pooling=true; - AYANOVA_FOLDER_USER_FILES: /var/lib/ayanova/files/user - AYANOVA_FOLDER_BACKUP_FILES: /var/lib/ayanova/files/backup - AYANOVA_LOG_PATH: /var/lib/ayanova - AYANOVA_LOG_LEVEL: Info -# AYANOVA_PERMANENTLY_ERASE_DATABASE: "true" - build: - context: ./ayanovadocker - dockerfile: Dockerfile - links: - - postgresserver - depends_on: - - "postgresserver" - -networks: - default: - external: - name: docker-network