From 328d9943fc6c23b08b2866cd1a1dcc1b97052c10 Mon Sep 17 00:00:00 2001
From: bach <bachir@figureslibres.io>
Date: Mon, 5 Sep 2022 14:54:21 +0200
Subject: [PATCH] replaced node:lts-alpine by node:lts-bullseye

---
 Docker/app/Dockerfile           | 47 ++++++++++++++++++++-------------
 Docker/app/client-entrypoint.sh |  2 +-
 Docker/nginx/default.conf       |  2 +-
 Makefile                        |  5 +++-
 app                             |  2 +-
 docker-compose.yml              |  3 ++-
 6 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/Docker/app/Dockerfile b/Docker/app/Dockerfile
index 8915447..23e10dd 100644
--- a/Docker/app/Dockerfile
+++ b/Docker/app/Dockerfile
@@ -1,30 +1,39 @@
-FROM node:lts-alpine
+FROM node:lts-bullseye
 
-RUN apk update && apk --no-cache add shadow && \
-    usermod -u 1001 node && \
-    groupmod -g 1001 node
+# THE ALL USER THINGS IS USELESS AS NODE IS ALREADY A USER @ 1000
 
-RUN find / -group 1000 -exec chgrp -h node {} \;
-RUN find / -user 1000 -exec chown -h node {} \;
+# RUN find / -group 1000 -exec chgrp -h node {} \;
+# RUN find / -user 1000 -exec chown -h node {} \;
 
-ARG USER_UID
-ARG USER_UNAME
-ARG USER_GID
-ARG USER_GNAME
+# ARG USER_UID
+# ARG USER_UNAME
+# ARG USER_GID
+# ARG USER_GNAME
 
 
-# RUN addgroup -g 1000 gdp && \
-    # adduser -h /home/gdp -D -u 1000 gdp && \
-RUN adduser -u ${USER_UID} -G users -s /bin/sh -D ${USER_UNAME}
-    # chown -R gdp:gdp /home/gdp
+# # RUN addgroup -g 1000 gdp && \
+#     # adduser -h /home/gdp -D -u 1000 gdp && \
+# RUN adduser -u ${USER_UID} -G users -s /bin/sh -D ${USER_UNAME}
+#     # chown -R gdp:gdp /home/gdp
 
-USER ${USER_UNAME}
+# RUN if getent group ${USER_GNAME} ; then groupdel ${USER_GNAME}; fi
+# RUN groupadd -g ${USER_GID} ${USER_GNAME}
+# RUN useradd -l -u ${USER_UID} -g ${USER_GNAME} ${USER_UNAME}
+# RUN install -d -m 0755 -o ${USER_UNAME} -g ${USER_GNAME} /home/${USER_UNAME}
+# RUN chown --changes --silent --no-dereference --recursive \
+#           --from=33:33 ${USER_UID}:${USER_GID} \
+#         /home/${USER_UNAME}
 
-COPY ./bashrc /home/${USER_UNAME}/.bashrc
-COPY ./inputrc /home/${USER_UNAME}/.inputrc
+# USER ${USER_UNAME}
+
+# COPY ./bashrc /home/${USER_UNAME}/.bashrc
+# COPY ./inputrc /home/${USER_UNAME}/.inputrc
+
+# COPY ./bashrc /home/node/.bashrc # should do an echo in already existing /home/node/.bashcr
+COPY ./inputrc /home/node/.inputrc
 
 COPY ./client-entrypoint.sh /usr/local/bin
-USER root
+# USER root
 RUN chmod +x /usr/local/bin/client-entrypoint.sh
-USER ${USER_UNAME}
+# USER ${USER_UNAME}
 CMD ["/bin/sh","/usr/local/bin/client-entrypoint.sh"]
diff --git a/Docker/app/client-entrypoint.sh b/Docker/app/client-entrypoint.sh
index a7f0b34..815cbad 100644
--- a/Docker/app/client-entrypoint.sh
+++ b/Docker/app/client-entrypoint.sh
@@ -22,7 +22,7 @@ echo "APP_ENV $APP_ENV"
 
 if [ "$APP_ENV" = "prod" ]; then
   echo "Run npm prod"
-  npm run prod
+  npm run build
 else
   echo "Run npm dev"
   npm run dev
diff --git a/Docker/nginx/default.conf b/Docker/nginx/default.conf
index 7ca4a3b..bc96297 100644
--- a/Docker/nginx/default.conf
+++ b/Docker/nginx/default.conf
@@ -1,5 +1,5 @@
 upstream app{
-    server app:8988;
+    server app:5173;
 }
 
 server {
diff --git a/Makefile b/Makefile
index 2c48ce0..7d91f2d 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,9 @@ build:
 buildnc:
 		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)
 
+buildncapp:
+		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) app
+
 downbuildup: down build up
 
 up:
@@ -56,7 +59,7 @@ exec_api:
 		docker exec -it ouatterrir-api-1 bash
 
 exec_app:
-		docker exec -it ouatterrir-app-1 sh
+		docker exec -it ouatterrir-app-1 bash
 
 restart_app:
 	docker-compose restart app
diff --git a/app b/app
index 3149c92..1a7ecfa 160000
--- a/app
+++ b/app
@@ -1 +1 @@
-Subproject commit 3149c92f11b88c436dcd66c7641ae9233b1d53cc
+Subproject commit 1a7ecfad8f1c63e5020c281ee1cb25e073f18d28
diff --git a/docker-compose.yml b/docker-compose.yml
index 3e14df0..ac0cca5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -71,10 +71,11 @@ services:
       - app
       - server
     ports:
-      - 8988:8988
+      - 5173:5173
     working_dir: "/app"
     environment:
       - APP_ENV=dev
+    tty: true
 
   nginx:
     build: ./Docker/nginx/