submodules update, added gdpFtIndex

.env

@@ -4,4 +4,5 @@ CLIENT_ROOT=./client
 SYNOPSX_ROOT=./synopsx
 WEBAPP_ROOT=./webapp
 DATA_ROOT=./data
+FTINDEX_ROOT=./gdpFtIndex
 LOG_ROOT=./log

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "webapp"]
 	path = webapp
 	url = https://github.com/guidesDeParis/webapp
+[submodule "gdpFtIndex"]
+	path = gdpFtIndex
+	url = https://github.com/guidesDeParis/gdpFtIndex.git

Docker/basex/Dockerfile

@@ -1,13 +1,16 @@
+# FROM basex/basexhttp:9.4.6
 FROM basex/basexhttp:latest
 
-COPY ./bashrc /srv/.bashrc
-COPY ./inputrc /srv/.inputrc
+# COPY ./bashrc /srv/.bashrc
+# COPY ./inputrc /srv/.inputrc
 
 # RUN basex "db:create('gdp','/srv/basex/src/gdp.tei.xml', (),map {'ftindex': true(),'stemming': true(),'casesens': true(),'diacritics': true(),'language': 'fr','updindex': true(),'autooptimize': true(),'maxlen': 96,'maxcats': 100,'splitsize': 0,'chop': false(),'textindex': true(),'attrindex': true(),'tokenindex': true(), 'xinclude': true()})"
 
 COPY ./gdp-entrypoint.sh /usr/local/bin
 USER root
 RUN chmod +x /usr/local/bin/gdp-entrypoint.sh
-# RUN ln -s /usr/local/bin/gdp-entrypoint.sh /srv/ # backwards compat
-USER basex
+# RUN chown -R basex:basex /usr/local/bin/gdp-entrypoint.sh
+# # RUN ln -s /usr/local/bin/gdp-entrypoint.sh /srv/ # backwards compat
+RUN chown -R basex:basex /srv
+# USER basex
 CMD ["/bin/sh","/usr/local/bin/gdp-entrypoint.sh"]

Docker/basex/gdp-entrypoint.sh

@@ -2,17 +2,41 @@
 
 # todo: run some checks
 
+id
+
+ls -ls / | grep srv
+
 echo "Creating GDP BaseX db"
 basex "db:create('gdp','/srv/basex/src/gdp.tei.xml', (),map {'ftindex': true(),'stemming': true(),'casesens': true(),'diacritics': true(),'language': 'fr','updindex': true(),'autooptimize': true(),'maxlen': 96,'maxcats': 100,'splitsize': 0,'chop': false(),'textindex': true(),'attrindex': true(),'tokenindex': true(), 'xinclude': true()})"
 # , 'serializer': 'indent=no'
 
-echo "Creating FullText Index tmp file"
-basex "xslt:transform(fn:doc('/srv/basex/src/gdp.tei.xml'), fn:doc('/srv/basex/src/xslt/generateFullTextIndex.xsl'))" > /tmp/gdpFtIndex.xml
+# echo "Creating FullText Index tmp file"
+# basex "xslt:transform(fn:doc('/srv/basex/src/gdp.tei.xml'), fn:doc('/srv/basex/src/xslt/generateFullTextIndex.xsl'))" > /tmp/gdpFtIndex.xml
 
 echo "Creating FullText Index DB"
-basex "db:create('gdpFtIndex', '/tmp/gdpFtIndex.xml', (),map {'ftindex': true(),'stemming': true(),'casesens': true(),'diacritics': true(),'language': 'fr','updindex': true(),'autooptimize': true(),'maxlen': 96,'maxcats': 100,'splitsize': 0,'chop': false(),'textindex': true(),'attrindex': true(),'tokenindex': true(), 'xinclude': true()})"
+basex "db:create('gdpFtIndex', '/srv/basex/ftindex/gdpFtIndex.xml', (),map {'ftindex': true(),'stemming': true(),'casesens': true(),'diacritics': true(),'language': 'fr','updindex': true(),'autooptimize': true(),'maxlen': 96,'maxcats': 100,'splitsize': 0,'chop': false(),'textindex': true(),'attrindex': true(),'tokenindex': true(), 'xinclude': true()})"
 # , 'serializer': 'indent=no'
 
+# echo "Creating Advanced Search Index"
+# basex -q "import module namespace gdp.models.tei = 'gdp.models.tei' at '/srv/basex/webapp/synopsx/workspace/gdp/models/tei.xqm' ;
+# let $index := ('gdpIndexNominum', 'gdpIndexLocorum')
+# return gdp.models.tei:addId2IndexedEntities($index)"
+# basex "declare namespace tei = 'http://www.tei-c.org/ns/1.0' ;
+# let $db := db:open('gdp')
+#   let $index := $db//tei:TEI[tei:teiHeader//tei:sourceDesc[@xml:id = $indexId]]
+#   for $occurence in fn:distinct-values($index//tei:listRelation/tei:relation/@passive ! fn:tokenize(., '\s+'))
+#   let $entries := $index//*[tei:listRelation/tei:relation[fn:contains(@passive, $occurence)]]
+#   let $element := $db//*[@xml:id = fn:substring-after($occurence, '#')]
+#   let $values := for $entry in $entries/@xml:id return fn:concat('#', $entry)
+#   return
+#     if ($element[fn:not(@ref)])
+#     then insert node attribute ref { $values } into $element
+#     else replace value of node $element/@ref with $values"
+
 # as we override the parent container CMD, we have to launch basexhttp here
 echo "Launching basexhttp"
 basexhttp
+
+# todo never launched, prev command never ends
+echo "Launching indexing"
+wget -S http://localhost:8984/indexing

Docker/client/Dockerfile

@@ -1,29 +1,68 @@
-FROM node:lts-alpine
+# FROM node:lts-alpine
+
+# RUN apk update && apk --no-cache add shadow && \
+#     usermod -u 1001 node && \
+#     groupmod -g 1001 node
+
+# ARG UID=1000
+# ARG UNAME=gdp
+# ARG GID=1000
+# ARG GNAME=users
+
+# #RUN find / -group ${UID} -exec chgrp -h node {} \;
+# #RUN find / -user ${UID} -exec chown -h node {} \;
+
+# # RUN addgroup -g ${GID} ${GNAME}
+# RUN if [ $(getent group ${GNAME}) ]; then echo "group ${GNAME} already exists"; else addgroup -g ${GID} ${GNAME}; fi
+# # else
+# #   echo "group does not exist."
+# # fi
+#     # adduser -h /home/gdp -D -u 1000 gdp && \
+# RUN adduser -u ${UID} -G ${GNAME} -s /bin/sh -D ${UNAME}
+#     # chown -R gdp:gdp /home/gdp
+
+# USER ${UNAME}
+
+# COPY ./bashrc /home/${UNAME}/.bashrc
+# COPY ./inputrc /home/${UNAME}/.inputrc
+
+# COPY ./client-entrypoint.sh /usr/local/bin
+# USER root
+# RUN chmod +x /usr/local/bin/client-entrypoint.sh
+# USER ${UNAME}
+# CMD ["/bin/sh","/usr/local/bin/client-entrypoint.sh"]
+
+
+# /////////////////////////////////////////////////////////////////////////////////
+
+
+FROM node:16-alpine
 
 RUN apk update && apk --no-cache add shadow && \
     usermod -u 1001 node && \
     groupmod -g 1001 node
 
-ARG UID=1000
-ARG UNAME=gdp
-ARG GID=1000
-ARG GNAME=users
+# RUN find / -group 1000 -exec chgrp -h node {} \;
+# RUN find / -user 1000 -exec chown -h node {} \;
 
-#RUN find / -group ${UID} -exec chgrp -h node {} \;
-#RUN find / -user ${UID} -exec chown -h node {} \;
+ARG USER_UID
+ARG USER_UNAME
+ARG USER_GID
+ARG USER_GNAME
 
-RUN addgroup -g ${DID} ${GNAME}
+RUN if [ $(getent group ${USER_GNAME}) ]; then echo "group ${USER_GNAME} already exists"; else addgroup -g ${USER_GID} ${USER_GNAME}; fi
+# RUN addgroup -g 1000 ${USER_GNAME}
     # adduser -h /home/gdp -D -u 1000 gdp && \
-RUN adduser -u ${UID} -G ${GNAME} -s /bin/sh -D ${UNAME}
+RUN adduser -u ${USER_UID} -G ${USER_GNAME} -s /bin/sh -D ${USER_UNAME}
     # chown -R gdp:gdp /home/gdp
 
-USER ${UNAME}
+USER ${USER_UNAME}
 
-COPY ./bashrc /home/${UNAME}/.bashrc
-COPY ./inputrc /home/${UNAME}/.inputrc
+COPY ./bashrc /home/${USER_UNAME}/.bashrc
+COPY ./inputrc /home/${USER_UNAME}/.inputrc
 
 COPY ./client-entrypoint.sh /usr/local/bin
 USER root
 RUN chmod +x /usr/local/bin/client-entrypoint.sh
-USER ${UNAME}
+USER ${USER_UNAME}
 CMD ["/bin/sh","/usr/local/bin/client-entrypoint.sh"]

Docker/client/client-entrypoint.sh

@@ -4,11 +4,26 @@ cat /etc/passwd|grep 1000
 
 cd /app
 
-echo "Cleaning node_modules"
-rm -rf node_modules
+# echo "Cleaning node_modules"
+# rm -rf node_modules
 
-echo "Npm install"
-npm install
+# echo "Cleaning npm cache"
+# npm cache clean --f
 
-echo "Run npm dev"
-npm run dev
+# echo "Npm install"
+# npm install
+
+echo "Npm clean install"
+npm ci
+
+# echo "Run npm dev"
+# npm run dev
+echo "APP_ENV $APP_ENV"
+
+if [ "$APP_ENV" = "prod" ]; then
+  echo "Run npm prod"
+  npm run prod
+else
+  echo "Run npm dev"
+  npm run dev
+fi

Makefile

@@ -0,0 +1,71 @@
+#!/usr/bin/make
+
+SHELL = /bin/sh
+
+USER_UID := $(shell id -u)
+USER_UNAME := $(shell id -un)
+USER_GID := $(shell id -g)
+USER_GNAME := $(shell id -gn)
+
+export USER_UID
+export USER_UNAME
+export USER_GID
+export USER_GNAME
+
+build: build_basex build_client
+
+build_basex:
+		docker-compose build basex
+build_client:
+		docker-compose build --build-arg USER_UID=$(USER_UID) --build-arg USER_UNAME=$(USER_UNAME) --build-arg USER_GID=$(USER_GID) --build-arg USER_GNAME=$(USER_GNAME) client
+
+buildnc: buildnc_basex buildnc_client
+
+buildnc_basex:
+		docker-compose build --pull --no-cache basex
+
+buildnc_client:
+		docker-compose build --no-cache --build-arg USER_UID=$(USER_UID) --build-arg USER_UNAME=$(USER_UNAME) --build-arg USER_GID=$(USER_GID) --build-arg USER_GNAME=$(USER_GNAME) client
+
+up:
+		docker-compose up
+upd:
+		docker-compose up -d
+
+up_basex:
+		docker-compose up -d basex
+
+up_client:
+		docker-compose up -d client
+
+
+restart_basex:
+		docker-compose restart basex
+		
+restart_client:
+		docker-compose restart client
+		
+# upbuild:
+# 		docker-compose up -d --build
+
+ps:
+		docker-compose ps
+
+logs:
+		docker-compose logs -f
+logs_basex:
+		docker-compose logs basex -f
+logs_client:
+		docker-compose logs client -f
+
+down:
+		docker-compose down
+
+exec_client:
+		docker exec -it gdp-client-1 sh
+
+exec_basex:
+		docker exec -it gdp-basex-1 sh
+
+exec_basex_root:
+		docker exec -u 0 -it gdp-basex-1 sh

README.md

@@ -27,7 +27,7 @@ sudo docker-compose build
 ```
 or with args for groups and users
 ```
-docker-compose build --build-arg UID=$(id -u) --build-arg GID=$(id -g) --build-arg UNAME=$(id -un) --build-arg GNAME=$(id -gn)
+docker-compose build --no-cache --build-arg UID=$(id -u) --build-arg GID=$(id -g) --build-arg UNAME=$(id -un) --build-arg GNAME=$(id -gn) [client | basex]
 ```
 ### run
 then each time you want to launch the app
@@ -42,11 +42,13 @@ the api is ready, you can go to http://localhost:8984/home
 before you can use the client you need to trigger this url http://localhost:8984/indexing
 
 ## Client
-open http://localhost:8988 in your browser
+open http://localhost:8998 in your browser
 
 ## Vhost or Cross Origins Policy
 Cross origin poilicy will block the api requests from client
+
 You'll need to install vhost domain for api and client, like dev.gdp.net and dev.api.gdp.net
+
 Or in firefox install this addon to allow cors addons.mozilla.org/en-US/firefox/addon/cors-everywhere/
 
 ## Logs
@@ -70,6 +72,82 @@ or rebuild if data was updated
 ```
 docker-compose up -d --build
 ```
+or
+```sh
+docker-compose build --no-cache [client | basex]
+docker-compose up -d [client | basex]
+```
+
+## Prod
+run containers for prod
+```
+docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d
+```
+client will be built the client container stop
+
+basex container will stay up
+
+you have to serve client/dist/index.html with your own webserver (e.g. nginx, apache, etc)
+
+### nginx conf
+```nginx
+server {
+    listen 80;
+    server_name dev.api.gdp.fr;
+
+    access_log off;
+    error_log  /var/log/nginx/gdp/error.log error;
+
+    location / {
+        proxy_pass http://127.0.0.1:8984;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_buffer_size          128k;
+        proxy_buffers              4 256k;
+        proxy_busy_buffers_size    256k;
+        add_header Access-Control-Allow-Origin *;
+    }
+}
+
+server {
+  listen 80;
+  server_name dev.gdp.fr;
+
+  access_log off;
+  error_log  /var/log/nginx/gdp/error.log error;
+
+  location / {
+    proxy_pass http://127.0.0.1:8998;
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_buffer_size          128k;
+    proxy_buffers              4 256k;
+    proxy_busy_buffers_size    256k;
+    add_header Access-Control-Allow-Origin *;
+  }
+}
+```
+
+## trouble shooting
+
+/srv/basex has bad owner : 1000:users instead of basex:basex (1948:1984) (WHY ??)
+```
+ docker exec -u 0 -it gdp-basex-1 sh
+ chown -R basex:basex /srv/basex
+```
+
+gdp-entrypoint is never launched, "launchit by hand" (WHY ??)
+```
+ docker exec -it gdp-basex-1 sh
+ . /usr/local/bin/gdp-entrypoint.sh
+```
+
+
+
 
 ## Doc
 

docker-compose.prod.yml

@@ -0,0 +1,7 @@
+version: '3.7'
+services:
+  basex:
+    restart: always
+  client:
+    environment:
+      - APP_ENV=prod

docker-compose.yml

@@ -6,7 +6,9 @@ services:
       - "${SYNOPSX_ROOT}:/srv/basex/webapp/synopsx"
       - "${WEBAPP_ROOT}:/srv/basex/webapp/synopsx/workspace/gdp"
       - "${DATA_ROOT}:/srv/basex/src"
+      - "${FTINDEX_ROOT}:/srv/basex/ftindex"
       - basex-home:/srv
+      # - basex-data:/srv/basex/data
       # - "${LOG_ROOT}:/var/log:rw"
     ports:
       - 1984:1984
@@ -17,13 +19,15 @@ services:
     build: ./Docker/client
     volumes:
       - "${CLIENT_ROOT}:/app"
-      # - client-home:/home/gdp
+      - client-home:/home/${USER_UNAME}
     ports:
-      - 8988:8988
+      - 8998:8998
     working_dir: "/app"
     depends_on:
       - basex
+    environment:
+      - APP_ENV=dev
 
 volumes:
   basex-home:
-  # client-home:
+  client-home: