From 94894fd27e831232543039ceadf8667ac3ce4bc0 Mon Sep 17 00:00:00 2001 From: Alexander Saprykin Date: Fri, 12 Apr 2019 11:20:05 +0200 Subject: [PATCH] Fix artrifact upload paths * Move artifact upload directory out of source tree by setting MEDIA_ROOT to `/var/lib/galaxy/media/` * Add `/var` directory to dockerignore. Signed-off-by: Alexander Saprykin --- .dockerignore | 2 +- galaxy/settings/default.py | 2 ++ scripts/docker/dev/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.dockerignore b/.dockerignore index 2dc19fad8..22e360d75 100644 --- a/.dockerignore +++ b/.dockerignore @@ -7,4 +7,4 @@ dist/ docs/docsite/_build/ galaxy.egg-info/ galaxyui/node_modules - +var/ diff --git a/galaxy/settings/default.py b/galaxy/settings/default.py index 328c7a57d..c77f02225 100644 --- a/galaxy/settings/default.py +++ b/galaxy/settings/default.py @@ -177,6 +177,8 @@ STATIC_ROOT = os.path.join(BASE_DIR, 'build', 'static') +MEDIA_ROOT = '/var/lib/galaxy/media/' + # Database # --------------------------------------------------------- diff --git a/scripts/docker/dev/Dockerfile b/scripts/docker/dev/Dockerfile index a63724356..65984b0bc 100644 --- a/scripts/docker/dev/Dockerfile +++ b/scripts/docker/dev/Dockerfile @@ -33,7 +33,7 @@ RUN yum -y install epel-release \ # Create directories structure RUN mkdir -p /galaxy \ /usr/share/galaxy \ - /var/lib/galaxy \ + /var/lib/galaxy/media \ /var/tmp/galaxy/imports \ /var/tmp/galaxy/uploads \ /var/run/galaxy