diff --git a/.env b/.env index bc3cc95..01e7c49 100644 --- a/.env +++ b/.env @@ -2,4 +2,5 @@ COMPOSE_PROJECT_NAME=gdp CLIENT_ROOT=./client SYNOPSX_ROOT=./synopsyx +DATA_ROOT=./data LOG_ROOT=./log diff --git a/.gitmodules b/.gitmodules index c94d604..d45b895 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "synopsx"] path = synopsx url = https://github.com/guidesDeParis/synopsx.git +[submodule "data"] + path = data + url = https://github.com/guidesDeParis/sourcesPrep.git diff --git a/data b/data new file mode 160000 index 0000000..423de0c --- /dev/null +++ b/data @@ -0,0 +1 @@ +Subproject commit 423de0caf06900f818a39e7aab828f5906e745e7 diff --git a/docker-compose.yml b/docker-compose.yml index f875950..16fe53c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,14 +2,13 @@ version: "3.5" services: basex: - build: ./Docker/basex + build: ./Docker/basex/ ports: - 1984:1984 - 8984:8984 - # volumes: - - "${SYNOPSX_ROOT}:/srv/basex/webapp/synopsx" - # - "${API_ROOT}:/srv/basex/data" - # - "${}:/srv/basex/repo" + volumes: + - "${DATA_ROOT}:/srv/basex/data" + - "${SYNOPSX_ROOT}:/srv/basex/webapp/synopsx" # - "${LOG_ROOT}:/var/log:rw" nginx: @@ -20,9 +19,5 @@ services: - "${CLIENT_ROOT}:/var/www/html" - "${LOG_ROOT}:/var/log:rw" working_dir: "/var/www/html/" - networks: depends_on: - - volumes: - - networks: + - basex