From 4198c96af1ad4dfb2a48e2adb38180eab3cdb33c Mon Sep 17 00:00:00 2001
From: Jose Ivan Vargas <jvargas@gitlab.com>
Date: Thu, 13 Apr 2017 13:26:07 -0500
Subject: [PATCH 1/2] Added experimental WSL gdk installation instructions
---
doc/howto/troubleshooting.md | 18 ++++++++++++
doc/prepare.md | 54 ++++++++++++++++++++++++++++++++++++
2 files changed, 72 insertions(+)
diff --git a/doc/howto/troubleshooting.md b/doc/howto/troubleshooting.md
index a15ddc7..3e6c0b2 100644
--- a/doc/howto/troubleshooting.md
+++ b/doc/howto/troubleshooting.md
@@ -356,6 +356,24 @@ In that case what you need to do is run the following command inside the gitlab
RAILS_ENV=test bundle exec rake db:reset
```
+## Windows 10 WSL common issues
+
+* `gdk run db` fails with exit code X
+
+ If you have restarted your computer recently don't forget to start the postgresql service manually, init.d scripts don't currently as of build 15063.138
+
+ TL;DR
+
+ `sudo service postgresql start`
+
+* `gdk run app` fails with gitaly error code XXX
+
+ Please run `gdk reconfigure`, note, this *might* happen during the initial run after the database has seeded
+
+* I get an EOF when accessing http://127.0.0.1:3000 instead of the sign up page
+
+ There's two possible solutions for this problem, make sure you have sufficient free RAM, otherwise just refresh the page.
+
## Other problems
Please open an issue on the [GDK issue tracker](https://gitlab.com/gitlab-org/gitlab-development-kit/issues).
diff --git a/doc/prepare.md b/doc/prepare.md
index 52a0f44..6f850a3 100644
--- a/doc/prepare.md
+++ b/doc/prepare.md
@@ -184,6 +184,60 @@ sudo pkg install postgresql93-server postgresql93-contrib postgresql-libpqxx \
redis go node icu krb5 phantomjs gmake
```
+### **Experimental** Windows 10 using the WSL (Windows Subsystem for Linux)
+
+Install node from source
+
+```
+curl -O https://nodejs.org/dist/v6.10.2/node-v6.10.2.tar.gz
+tar -zxf node-v6.10.2.tar.gz
+cd node-v6.10.2
+```
+follow the instructions inside the BUILDING.md document
+
+TL;DR BUILDING.md
+
+```
+sudo apt-get install build-essential
+./configure
+make -j4 # adjust according to your available CPU capacity
+sudo make install
+```
+
+Install Ruby 2.3.3 using [RVM](https://rvm.io/)
+
+```
+rvm install 2.3.3
+rvm use 2.3.3
+```
+
+Install yarn *Recommended but it can be skipped*
+
+```
+curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
+echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+sudo apt-get update && sudo apt-get install yarn
+```
+
+Install the remainder of the prerequisites
+```
+# Add apt-add-repository helper script
+sudo apt-get install software-properties-common python-software-properties
+# This PPA contains an up-to-date version of Go
+sudo apt-add-repository -y ppa:ubuntu-lxc/lxd-stable
+sudo apt-get update
+sudo apt-get install git postgresql postgresql-contrib libpq-dev redis-server libicu-dev cmake g++ libkrb5-dev golang ed pkg-config
+sudo npm install phantomjs-prebuilt@2.1.12 -g
+```
+
+Once the prerequisites have been installed don't forget to start the postgresql manually otherwise the gdk installation will fail
+
+```
+sudo service postgresql start
+```
+
+For some common troubleshooting steps for Windows 10 GDK installs please refer to [Troubleshooting](./howto/troubleshooting.md)
+
### Other platforms
If you got GDK running an another platform please send a merge request to add
--
GitLab
From 5fd46a658de3dfed842551e3204a13d6e3052959 Mon Sep 17 00:00:00 2001
From: Jose Ivan Vargas <jvargas@gitlab.com>
Date: Thu, 13 Apr 2017 15:19:32 -0500
Subject: [PATCH 2/2] Changed postgresql note
Also made yarn a mandatory installation process.
Some corrections
Removed some redudant troubleshooting options
---
doc/howto/troubleshooting.md | 12 +-----------
doc/prepare.md | 10 ++++------
2 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/doc/howto/troubleshooting.md b/doc/howto/troubleshooting.md
index 3e6c0b2..c3b1626 100644
--- a/doc/howto/troubleshooting.md
+++ b/doc/howto/troubleshooting.md
@@ -360,20 +360,10 @@ RAILS_ENV=test bundle exec rake db:reset
* `gdk run db` fails with exit code X
- If you have restarted your computer recently don't forget to start the postgresql service manually, init.d scripts don't currently as of build 15063.138
-
- TL;DR
+ If you have restarted your computer recently, don't forget to start PostgreSQL server manually; init.d scripts don't work currently as of build 15063.138:
`sudo service postgresql start`
-* `gdk run app` fails with gitaly error code XXX
-
- Please run `gdk reconfigure`, note, this *might* happen during the initial run after the database has seeded
-
-* I get an EOF when accessing http://127.0.0.1:3000 instead of the sign up page
-
- There's two possible solutions for this problem, make sure you have sufficient free RAM, otherwise just refresh the page.
-
## Other problems
Please open an issue on the [GDK issue tracker](https://gitlab.com/gitlab-org/gitlab-development-kit/issues).
diff --git a/doc/prepare.md b/doc/prepare.md
index 6f850a3..bddcf6e 100644
--- a/doc/prepare.md
+++ b/doc/prepare.md
@@ -186,16 +186,14 @@ redis go node icu krb5 phantomjs gmake
### **Experimental** Windows 10 using the WSL (Windows Subsystem for Linux)
-Install node from source
+Install NodeJS from source
```
curl -O https://nodejs.org/dist/v6.10.2/node-v6.10.2.tar.gz
tar -zxf node-v6.10.2.tar.gz
cd node-v6.10.2
```
-follow the instructions inside the BUILDING.md document
-
-TL;DR BUILDING.md
+Build the NodeJS library. The following instructions are copied from the NodeJS BUILDING.md document:
```
sudo apt-get install build-essential
@@ -211,7 +209,7 @@ rvm install 2.3.3
rvm use 2.3.3
```
-Install yarn *Recommended but it can be skipped*
+Install yarn
```
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
@@ -230,7 +228,7 @@ sudo apt-get install git postgresql postgresql-contrib libpq-dev redis-server li
sudo npm install phantomjs-prebuilt@2.1.12 -g
```
-Once the prerequisites have been installed don't forget to start the postgresql manually otherwise the gdk installation will fail
+Start the PostgreSQL database
```
sudo service postgresql start
--
GitLab