From 7110e8fce11f37cffa809ef9122bfb44e9bc3663 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 25 Apr 2017 21:05:35 +0200
Subject: [PATCH 1/3] Install yarn in GDK docker image

---
 Dockerfile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index e710c3e..54f2f96 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,6 +21,11 @@ RUN apt-get install -y git postgresql postgresql-contrib libpq-dev redis-server
   libicu-dev cmake g++ nodejs libkrb5-dev golang ed pkg-config libsqlite3-dev \
   libreadline-dev npm sudo nodejs-legacy
 
+# install yarn
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
+RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+RUN apt-get update && sudo apt-get install yarn
+
 # GDK tools
 RUN apt-get install -y net-tools psmisc
 
-- 
GitLab


From 777ed6ad4c78e28720b7fb23e406be893825099b Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 25 Apr 2017 21:16:54 +0200
Subject: [PATCH 2/3] Add APT https transport package

---
 Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 54f2f96..5f88ab1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,13 +21,13 @@ RUN apt-get install -y git postgresql postgresql-contrib libpq-dev redis-server
   libicu-dev cmake g++ nodejs libkrb5-dev golang ed pkg-config libsqlite3-dev \
   libreadline-dev npm sudo nodejs-legacy
 
+# GDK tools
+RUN apt-get install -y net-tools psmisc apt-transport-https
+
 # install yarn
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
 RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
-RUN apt-get update && sudo apt-get install yarn
-
-# GDK tools
-RUN apt-get install -y net-tools psmisc
+RUN apt-get update && apt-get install -y yarn
 
 # Add GDK user
 RUN useradd --user-group --create-home gdk
-- 
GitLab


From 4e3e1acc2806d408181b397ed8f3aeb1ef161a6d Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 25 Apr 2017 22:42:13 +0200
Subject: [PATCH 3/3] Install newer version of nodejs in docker image

---
 Dockerfile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5f88ab1..62bda96 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,8 +18,12 @@ RUN apt-get install -y libssl-dev
 
 # rest of gitlab requirements
 RUN apt-get install -y git postgresql postgresql-contrib libpq-dev redis-server \
-  libicu-dev cmake g++ nodejs libkrb5-dev golang ed pkg-config libsqlite3-dev \
-  libreadline-dev npm sudo nodejs-legacy
+  libicu-dev cmake g++ libkrb5-dev golang ed pkg-config libsqlite3-dev \
+  libreadline-dev sudo
+
+# install nodejs
+RUN curl -sL https://deb.nodesource.com/setup_6.x | bash -
+RUN apt-get install -y nodejs
 
 # GDK tools
 RUN apt-get install -y net-tools psmisc apt-transport-https
-- 
GitLab