diff --git a/.env b/.env index 01e7c49..2bec9b6 100644 --- a/.env +++ b/.env @@ -1,6 +1,7 @@ COMPOSE_PROJECT_NAME=gdp CLIENT_ROOT=./client -SYNOPSX_ROOT=./synopsyx +SYNOPSX_ROOT=./synopsx +WEBAPP_ROOT=./webapp DATA_ROOT=./data LOG_ROOT=./log diff --git a/.gitmodules b/.gitmodules index d45b895..ec968f8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "data"] path = data url = https://github.com/guidesDeParis/sourcesPrep.git +[submodule "webapp"] + path = webapp + url = https://github.com/guidesDeParis/webapp diff --git a/Docker/basex/Dockerfile b/Docker/basex/Dockerfile index b045a4f..3e0d990 100644 --- a/Docker/basex/Dockerfile +++ b/Docker/basex/Dockerfile @@ -1 +1,3 @@ FROM basex/basexhttp:latest + +# RUN basex db:create("gpd","/srv/basex/src/gdp.tei.xml",(), map{'ftindex':true()}) diff --git a/README.md b/README.md index ccfce22..03d26ad 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,43 @@ # docker-gdp +## Install docker +``` +sudo pacman -S docker docker-compose docker-machine +``` + +## Clone this repos + +this will clone this repos (main docker environement) and the edlp drupal 8 source code (without sites/default folder) + +``` +git clone --recursive -o figli https://figureslibres.io/gogs/bachir/docker-gdp.git +``` + +## Docker + +### build +only before the first run (may take some time) +``` +sudo docker-compose build +``` +### run +then each time you want to launch the app +``` +sudo docker-compose up -d +``` + +## DB +Only at first up, creat the basex database +``` +sudo docker exec -it gdp_basex_1 bash +basex +run db:create('gdp','/srv/basex/src/gdp.tei.xml',...) +``` + +## Doc + https://github.com/guidesDeParis/webapp/blob/master/install.md http://docs.basex.org/wiki/Docker + +https://hub.docker.com/r/basex/basexhttp diff --git a/docker-compose.yml b/docker-compose.yml index 16fe53c..77e8f13 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,8 +7,9 @@ services: - 1984:1984 - 8984:8984 volumes: - - "${DATA_ROOT}:/srv/basex/data" - "${SYNOPSX_ROOT}:/srv/basex/webapp/synopsx" + - "${WEBAPP_ROOT}:/srv/basex/webapp/synopsx/workspace/gdp" + - "${DATA_ROOT}:/srv/basex/src" # - "${LOG_ROOT}:/var/log:rw" nginx: diff --git a/synopsx b/synopsx index 26c0ca5..558dd83 160000 --- a/synopsx +++ b/synopsx @@ -1 +1 @@ -Subproject commit 26c0ca566ed1aa89abf7839a685997e11b79d45b +Subproject commit 558dd832a26b84f51bd7cc5ff52bde76b99a4692 diff --git a/webapp b/webapp new file mode 160000 index 0000000..e6ca72b --- /dev/null +++ b/webapp @@ -0,0 +1 @@ +Subproject commit e6ca72b4a07be9b43b8514c8d3fa91f73753eae2