From 971aee02070c4b6b55d8014d1cad8e78823b0d10 Mon Sep 17 00:00:00 2001 From: Greg Hecquet Date: Mon, 18 Jun 2018 16:29:50 +0200 Subject: [PATCH] Fixing php error --- discovery/install/lib/frontend.go | 2 +- tools/docker/docker-compose.yaml | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/discovery/install/lib/frontend.go b/discovery/install/lib/frontend.go index 8ad09b1f13..3e8f371d89 100644 --- a/discovery/install/lib/frontend.go +++ b/discovery/install/lib/frontend.go @@ -199,7 +199,7 @@ func checkPhpFpm(installConfig *install.InstallConfig) *install.CheckResult { if e != nil { checkError = e } else { - folder := filepath.Join(config.ApplicationDataDir(), "phptest") + folder := filepath.Join(config.ApplicationDataDir(), "static", "pydio", "phptest") os.MkdirAll(folder, 0777) fpm.DetectPhpInfos(configs, folder) os.Remove(folder) diff --git a/tools/docker/docker-compose.yaml b/tools/docker/docker-compose.yaml index 78b8f90af5..b01c2e32ea 100644 --- a/tools/docker/docker-compose.yaml +++ b/tools/docker/docker-compose.yaml @@ -10,8 +10,6 @@ services: environment: - CELLS_BIND=localhost:8080 - CELLS_EXTERNAL=localhost:8080 - - CELLS_NO_SSL=1 - network_mode: "host" # MySQL image with a default database cells and a dedicated user pydio mysql: @@ -24,15 +22,14 @@ services: MYSQL_PASSWORD: P@ssw0rd command: [mysqld, --character-set-server=utf8mb4, --collation-server=utf8mb4_unicode_ci] ports: ["3306:3306"] - network_mode: "host" # PHP FPM image with the static named volume from the cells container php: image: cells-php:latest restart: always volumes: ["static:/root/.config/pydio/cells/static/pydio"] - network_mode: "host" volumes: static: {} data: {} + php: {}