From e509db16a6ebbe67d57c193a98a34a2a92b04801 Mon Sep 17 00:00:00 2001
From: bach <bachir@figureslibres.io>
Date: Mon, 29 Nov 2021 15:51:56 +0100
Subject: [PATCH] misc

---
 Docker/basex/Dockerfile            |  6 ++++--
 Docker/client/Dockerfile           |  6 +++---
 Docker/client/client-entrypoint.sh | 15 +++++++++------
 Makefile                           | 13 +++++++++++--
 docker-compose.yml                 |  6 +++---
 5 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/Docker/basex/Dockerfile b/Docker/basex/Dockerfile
index 54e56eb..9d92901 100644
--- a/Docker/basex/Dockerfile
+++ b/Docker/basex/Dockerfile
@@ -1,4 +1,5 @@
-FROM basex/basexhttp:9.4.6
+# FROM basex/basexhttp:9.4.6
+FROM basex/basexhttp:latest
 
 # COPY ./bashrc /srv/.bashrc
 # COPY ./inputrc /srv/.inputrc
@@ -8,7 +9,8 @@ FROM basex/basexhttp:9.4.6
 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
+# 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/basex
 USER basex
 CMD ["/bin/sh","/usr/local/bin/gdp-entrypoint.sh"]
diff --git a/Docker/client/Dockerfile b/Docker/client/Dockerfile
index 093b8d3..b82fb2e 100644
--- a/Docker/client/Dockerfile
+++ b/Docker/client/Dockerfile
@@ -50,10 +50,10 @@ ARG USER_UNAME
 ARG USER_GID
 ARG USER_GNAME
 
-
-# RUN addgroup -g 1000 gdp && \
+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 ${USER_UID} -G users -s /bin/sh -D ${USER_UNAME}
+RUN adduser -u ${USER_UID} -G ${USER_GNAME} -s /bin/sh -D ${USER_UNAME}
     # chown -R gdp:gdp /home/gdp
 
 USER ${USER_UNAME}
diff --git a/Docker/client/client-entrypoint.sh b/Docker/client/client-entrypoint.sh
index 0be4723..e0fe177 100644
--- a/Docker/client/client-entrypoint.sh
+++ b/Docker/client/client-entrypoint.sh
@@ -4,14 +4,17 @@ cat /etc/passwd|grep 1000
 
 cd /app
 
-echo "Cleaning node_modules"
-rm -rf node_modules
+# echo "Cleaning node_modules"
+# rm -rf node_modules
 
-echo "Cleaning npm cache"
-npm cache clean --f
+# echo "Cleaning npm cache"
+# npm cache clean --f
 
-echo "Npm install"
-npm install
+# echo "Npm install"
+# npm install
+
+echo "Npm clean install"
+npm ci
 
 # echo "Run npm dev"
 # npm run dev
diff --git a/Makefile b/Makefile
index e8728b0..8b996c6 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ build_client:
 buildnc: buildnc_basex buildnc_client
 
 buildnc_basex:
-		docker-compose build --no-cache 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
@@ -37,6 +37,12 @@ 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
 
@@ -47,7 +53,7 @@ logs:
 		docker-compose logs -f
 logs_basex:
 		docker-compose logs basex -f
-logs_npm:
+logs_client:
 		docker-compose logs client -f
 
 down:
@@ -58,3 +64,6 @@ exec_client:
 
 exec_basex:
 		docker exec -it gdp-basex-1 sh
+
+exec_basex_root:
+		docker exec -u 0 -it gdp-basex-1 sh
diff --git a/docker-compose.yml b/docker-compose.yml
index 8f28891..7d6e67e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,9 +18,9 @@ services:
     build: ./Docker/client
     volumes:
       - "${CLIENT_ROOT}:/app"
-      # - client-home:/home/gdp
+      - client-home:/home/${USER_UNAME}
     ports:
-      - 8998:8988
+      - 8998:8998
     working_dir: "/app"
     depends_on:
       - basex
@@ -29,4 +29,4 @@ services:
 
 volumes:
   basex-home:
-  # client-home:
+  client-home: