Browse Source

updated synopsx, added webapp mount, readme

Bachir Soussi Chiadmi 4 months ago
parent
commit
237acc11e2
7 changed files with 49 additions and 3 deletions
  1. 2 1
      .env
  2. 3 0
      .gitmodules
  3. 2 0
      Docker/basex/Dockerfile
  4. 38 0
      README.md
  5. 2 1
      docker-compose.yml
  6. 1 1
      synopsx
  7. 1 0
      webapp

+ 2 - 1
.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

+ 3 - 0
.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

+ 2 - 0
Docker/basex/Dockerfile

@@ -1 +1,3 @@
 FROM basex/basexhttp:latest
+
+# RUN basex db:create("gpd","/srv/basex/src/gdp.tei.xml",(), map{'ftindex':true()})

+ 38 - 0
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

+ 2 - 1
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:

+ 1 - 1
synopsx

@@ -1 +1 @@
-Subproject commit 26c0ca566ed1aa89abf7839a685997e11b79d45b
+Subproject commit 558dd832a26b84f51bd7cc5ff52bde76b99a4692

+ 1 - 0
webapp

@@ -0,0 +1 @@
+Subproject commit e6ca72b4a07be9b43b8514c8d3fa91f73753eae2