Download as
Browse Code »

Commit 5a9503576d1689188d45fdba24dca7ad180efd94

Authored by Jacob Vosmaer
2 parents 1ff686b5 a67fa478
Exists in master and in 13 other branches 6-8-stable, 6-8-stable-ee, 6-9-stable, 6-9-stable-ee, 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Merge branch 'update_build_doc' into 'master' 

Update Build Documentation
Showing 2 changed files with 35 additions and 14 deletions   Show diff stats
@@ -11,10 +11,11 @@ sudo apt-get update @@ -11,10 +11,11 @@ sudo apt-get update
11 sudo apt-get upgrade 11 sudo apt-get upgrade
12 12
13 # Set up the firewall to only allow inbound SSH traffic 13 # Set up the firewall to only allow inbound SSH traffic
  14 +sudo apt-get install ufw
14 sudo ufw allow ssh 15 sudo ufw allow ssh
15 sudo ufw enable 16 sudo ufw enable
16 17
17 -# Check for SSH password logins; they should be disabled 18 +# Check for SSH password logins, they should be disabled; The command below should return no results
18 grep '^[^#]*PasswordAuthentication' /etc/ssh/sshd_config 19 grep '^[^#]*PasswordAuthentication' /etc/ssh/sshd_config
19 20
20 # Install dependencies 21 # Install dependencies
@@ -31,6 +32,9 @@ sudo chown omnibus-build:omnibus-build /opt/gitlab /var/cache/omnibus @@ -31,6 +32,9 @@ sudo chown omnibus-build:omnibus-build /opt/gitlab /var/cache/omnibus
31 Then, as the build user (omnibus-build): 32 Then, as the build user (omnibus-build):
32 33
33 ```shell 34 ```shell
  35 +# Login as omnibus-build user
  36 +sudo su - omnibus-build
  37 +
34 # Clone the omnibus repo 38 # Clone the omnibus repo
35 git clone https://gitlab.com/gitlab-org/omnibus-gitlab.git 39 git clone https://gitlab.com/gitlab-org/omnibus-gitlab.git
36 40
doc/release.md
  Diff comments   View file @5a95035
@@ -31,17 +31,6 @@ git push origin 6-6-stable 6.6.0.omnibus @@ -31,17 +31,6 @@ git push origin 6-6-stable 6.6.0.omnibus
31 31
32 ### One-time 32 ### One-time
33 33
34 -- Set up the `attach.sh` script  
35 -  
36 -```shell  
37 -sudo su - omnibus-build  
38 -cat > attach.sh <<EOF  
39 -#!/bin/sh  
40 -script -c 'screen -x || screen' /dev/null  
41 -EOF  
42 -chmod +x attach.sh  
43 -```  
44 -  
45 - Install release dependencies 34 - Install release dependencies
46 35
47 ```shell 36 ```shell
@@ -53,7 +42,17 @@ sudo yum install python-pip @@ -53,7 +42,17 @@ sudo yum install python-pip
53 42
54 # Both 43 # Both
55 sudo pip install awscli 44 sudo pip install awscli
56 -aws configure # enter AWS key and secret 45 +```
  46 +
  47 +# Make sure sendmail is installed; for Debian 7
  48 +```shell
  49 +sudo apt-get install sendmail-bin
  50 +```
  51 +
  52 +As omnibus-build user:
  53 +
  54 +```shell
  55 +sudo su - omnibus-build
57 ``` 56 ```
58 57
59 - Set up a deploy key to fetch the GitLab EE source code. 58 - Set up a deploy key to fetch the GitLab EE source code.
@@ -64,6 +63,24 @@ aws configure # enter AWS key and secret @@ -64,6 +63,24 @@ aws configure # enter AWS key and secret
64 echo "Subject: testing from $(uname -n)" | sendmail $(whoami) 63 echo "Subject: testing from $(uname -n)" | sendmail $(whoami)
65 ``` 64 ```
66 65
  66 +- Configure aws credentials
  67 +
  68 +```shell
  69 +aws configure # enter AWS key and secret
  70 +```
  71 +
  72 +- Set up the `attach.sh` script
  73 +
  74 +```shell
  75 +# Install screen first
  76 +sudo apt-get install screen
  77 +cat > attach.sh <<EOF
  78 +#!/bin/sh
  79 +script -c 'screen -x || screen' /dev/null
  80 +EOF
  81 +chmod +x attach.sh
  82 +```
  83 +
67 ### Each build 84 ### Each build
68 85
69 - Log in as the build user and start a screen session 86 - Log in as the build user and start a screen session
@@ -104,4 +121,4 @@ This will `clean --purge` the build environment, build a package and upload it t @@ -104,4 +121,4 @@ This will `clean --purge` the build environment, build a package and upload it t
104 See a previous [CE example](https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/141) 121 See a previous [CE example](https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/141)
105 and [EE example](https://dev.gitlab.org/gitlab/gitlab-ee/commit/7301417820404f92ca7c0a9940408ef414ef3c01). 122 and [EE example](https://dev.gitlab.org/gitlab/gitlab-ee/commit/7301417820404f92ca7c0a9940408ef414ef3c01).
106 123
107 -[the gitlab-rails version in omnibus-gitlab]: ../master/config/software/gitlab-rails.rb#L20  
108 \ No newline at end of file 124 \ No newline at end of file
  125 +[the gitlab-rails version in omnibus-gitlab]: ../master/config/software/gitlab-rails.rb#L20