From 128800cb3fe52756c53e6d03c04048f5d5bf42f4 Mon Sep 17 00:00:00 2001
From: Bachir Soussi Chiadmi <bachir@figureslibres.io>
Date: Wed, 3 Jun 2020 11:52:04 +0200
Subject: [PATCH] docker client is building

---
 Docker/app/Dockerfile                       | 30 ++++++++++++++++++++
 Docker/{client => app}/bashrc               |  0
 Docker/{client => app}/client-entrypoint.sh |  0
 Docker/{client => app}/inputrc              |  0
 Docker/client/Dockerfile                    | 31 ---------------------
 Makefile                                    |  8 ++++--
 app                                         |  2 +-
 docker-compose.yml                          | 14 ++++++++--
 8 files changed, 48 insertions(+), 37 deletions(-)
 create mode 100644 Docker/app/Dockerfile
 rename Docker/{client => app}/bashrc (100%)
 rename Docker/{client => app}/client-entrypoint.sh (100%)
 rename Docker/{client => app}/inputrc (100%)
 delete mode 100644 Docker/client/Dockerfile

diff --git a/Docker/app/Dockerfile b/Docker/app/Dockerfile
new file mode 100644
index 0000000..8915447
--- /dev/null
+++ b/Docker/app/Dockerfile
@@ -0,0 +1,30 @@
+FROM node:lts-alpine
+
+RUN apk update && apk --no-cache add shadow && \
+    usermod -u 1001 node && \
+    groupmod -g 1001 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
+
+
+# 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}
+
+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 ${USER_UNAME}
+CMD ["/bin/sh","/usr/local/bin/client-entrypoint.sh"]
diff --git a/Docker/client/bashrc b/Docker/app/bashrc
similarity index 100%
rename from Docker/client/bashrc
rename to Docker/app/bashrc
diff --git a/Docker/client/client-entrypoint.sh b/Docker/app/client-entrypoint.sh
similarity index 100%
rename from Docker/client/client-entrypoint.sh
rename to Docker/app/client-entrypoint.sh
diff --git a/Docker/client/inputrc b/Docker/app/inputrc
similarity index 100%
rename from Docker/client/inputrc
rename to Docker/app/inputrc
diff --git a/Docker/client/Dockerfile b/Docker/client/Dockerfile
deleted file mode 100644
index 86e8737..0000000
--- a/Docker/client/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM node:lts-alpine
-
-# RUN apk update && apk --no-cache add shadow && \
-#     usermod -u 1001 node && \
-#     groupmod -g 1001 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
-
-RUN if getent group ${USER_GNAME} ; then groupdel ${USER_GNAME}; fi &&\
-		groupadd -g ${USER_GID} ${USER_GNAME} &&\
-    useradd -l -u ${USER_UID} -g ${USER_GNAME} ${USER_UNAME} &&\
-    install -d -m 0755 -o ${USER_UNAME} -g ${USER_GNAME} /home/${USER_UNAME} &&\
-    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 root
-COPY ./client-entrypoint.sh /usr/local/bin
-RUN chmod +x /usr/local/bin/client-entrypoint.sh
-
-USER ${USER_UNAME}
-CMD ["/bin/sh","/usr/local/bin/client-entrypoint.sh"]
diff --git a/Makefile b/Makefile
index 9961cc6..3421818 100644
--- a/Makefile
+++ b/Makefile
@@ -33,8 +33,12 @@ logs:
 down:
 		docker-compose down
 
-# exec_php:
-# 		docker exec -it materiod8_php_1 bash
+restart_client:
+		docker-compose restart client
+
+exec_client:
+		docker exec -it muntadas_client_1 bash
+
 #
 # exec_mysql:
 # 		docker exec -it materiod8_mysql_1 bash
diff --git a/app b/app
index 574cf94..15abfa3 160000
--- a/app
+++ b/app
@@ -1 +1 @@
-Subproject commit 574cf945f4d2e1735aecc497518910dec5166484
+Subproject commit 15abfa350747015e77dbd29c33d97b0a5f27c234
diff --git a/docker-compose.yml b/docker-compose.yml
index 37adbb1..d15bb7b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,15 @@
 version: "3.5"
 
 services:
+  client:
+    build: ./Docker/app
+    volumes:
+      - "${CLIENT_ROOT}:/app"
+      # - client-home:/home/gdp
+    ports:
+      - 8788:8988
+    working_dir: "/app"
 
-volumes:
-
-networks:
+# volumes:
+#
+# networks: