From 9ef472700942ad8c2daa8368da684564892081d8 Mon Sep 17 00:00:00 2001
From: Bachir Soussi Chiadmi <bachir@figureslibres.io>
Date: Mon, 2 Mar 2020 17:03:13 +0100
Subject: [PATCH] it's working

---
 Docker/app/entrypoint.sh |  2 ++
 Makefile                 | 40 ++++++++++++++++++++++++++++++++++++++++
 docker-compose.yml       |  1 +
 3 files changed, 43 insertions(+)
 create mode 100644 Makefile

diff --git a/Docker/app/entrypoint.sh b/Docker/app/entrypoint.sh
index 9d6f1e8..a5b5e78 100644
--- a/Docker/app/entrypoint.sh
+++ b/Docker/app/entrypoint.sh
@@ -7,5 +7,7 @@ echo "Npm install"
 cd /app
 npm install
 
+npm rebuild node-sass
+
 echo "Run npm dev"
 npm run dev
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..9b1bea5
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,40 @@
+#!/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:
+		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)
+
+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)
+
+up:
+		docker-compose up
+
+upd:
+		docker-compose up -d
+
+upbuild:
+		docker-compose up -d --build
+
+ps:
+		docker-compose ps
+
+logs:
+		docker-compose logs -f
+
+down:
+		docker-compose down
+
+exec_app:
+		docker exec -it offline_timeline_app_1 sh
diff --git a/docker-compose.yml b/docker-compose.yml
index ed8da3c..204d95b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,6 +2,7 @@ version: '3.7'
 services:
   app:
     build: ./Docker/app
+    user: ${USER_UID}:${USER_GID}
     volumes:
       - "${APP_ROOT}:/app"
     ports: