From 8aaf094716224f9c0f4960368556c42dcc1db023 Mon Sep 17 00:00:00 2001 From: nmaillat Date: Mon, 11 May 2020 15:22:51 +0200 Subject: [PATCH] volumes for download,lazaret, tmp as env variable --- .env | 5 +++++ docker/phraseanet/auto-install.sh | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.env b/.env index f5d7403856..a6491fa9d2 100644 --- a/.env +++ b/.env @@ -90,6 +90,11 @@ PHRASEANET_THUMBNAILS_DIR=./www/thumbnails PHRASEANET_CUSTOM_DIR=./www/custom PHRASEANET_TMP_DIR=./tmp PHRASEANET_CACHE_DIR=./cache +PHRASEANET_DOWNLOAD_DIR=./datas/download +PHRASEANET_LAZARET_DIR=./datas/lazaret +PHRASEANET_CAPTION_DIR=./tmp/caption +PHRASEANET_WORKER_TMP=./tmp/worker + # For dev who don't have SSH_AUTH_SOCK (avoid an empty volume name) diff --git a/docker/phraseanet/auto-install.sh b/docker/phraseanet/auto-install.sh index ec02d3e697..c024af7357 100755 --- a/docker/phraseanet/auto-install.sh +++ b/docker/phraseanet/auto-install.sh @@ -23,10 +23,10 @@ fi --appbox=$INSTALL_APPBOX \ --databox=$INSTALL_DATABOX \ --server-name=$INSTALL_SERVER_NAME \ - --download-path=/var/alchemy/Phraseanet/datas/download \ - --lazaret-path=/var/alchemy/Phraseanet/datas/lazaret \ - --caption-path=/var/alchemy/Phraseanet/tmp/caption \ - --worker-tmp-files=/var/alchemy/Phraseanet/tmp \ + --download-path=$PHRASEANET_DOWNLOAD_DIR \ + --lazaret-path=$PHRASEANET_LAZARET_DIR \ + --caption-path=$PHRASEANET_CAPTION_DIR \ + --worker-tmp-files=$PHRASEANET_WORKER_TMP \ --data-path=/var/alchemy/Phraseanet/datas -y # Bus configuration for scheduler & worker