From 6ca8eb8acb79f1db7902c10dc335d9b97f8b26b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=ABl=20Gilain?= <noel.gilain@businessdecision.com>
Date: Fri, 30 Aug 2019 11:53:25 +0200
Subject: [PATCH] Update docker environment : mainly fixing missing npm

---
 doc/install.md        | 5 +++--
 docker/php/Dockerfile | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/doc/install.md b/doc/install.md
index 8b2f755..fec04a9 100644
--- a/doc/install.md
+++ b/doc/install.md
@@ -11,8 +11,7 @@
 ```bash
 git clone https://github.com/julienj/twity.git
 cd twity
-cp .env.dist .env
-composer insall
+composer install
 npm install
 npm run build
 ```
@@ -57,6 +56,8 @@ GITLAB_CLIENT_ID=my-client-id
 GITLAB_CLIENT_ID_SECRET=my-secret
 ```
 
+If you choose to setup the Gilab Oauth, when creating the twity application on your Gitlab account, you will have to
+fill in the redirect uri. These uri is `http(s)://YOURTWITYDOMAIN/login/gitlab`
 
 ## Create indexes
 
diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
index 130d2dc..751af60 100644
--- a/docker/php/Dockerfile
+++ b/docker/php/Dockerfile
@@ -24,6 +24,8 @@ RUN apt-get install --yes gnupg
 RUN curl -sL https://deb.nodesource.com/setup_8.x | bash
 RUN apt-get install --yes nodejs
 
+#npm
+RUN apt-get install --yes npm
 
 # xdebug
 RUN pecl install xdebug
@@ -35,4 +37,4 @@ RUN apt-get install --yes librabbitmq-dev
 RUN pecl install amqp
 RUN echo "extension=amqp.so" > /usr/local/etc/php/conf.d/amqp.ini
 
-
+WORKDIR /srv/twity