Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
b09a329f
Commit
b09a329f
authored
Jun 07, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use ruby:2.1 and ruby:2.2 images
parent
0b4981e7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
2 deletions
+16
-2
.gitlab-ci.yml
.gitlab-ci.yml
+2
-2
scripts/prepare_build.sh
scripts/prepare_build.sh
+14
-0
No files found.
.gitlab-ci.yml
View file @
b09a329f
image
:
registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.1
image
:
"
ruby:2.1"
services
:
-
mysql:latest
...
...
@@ -116,7 +116,7 @@ spinach 9 10: *knapsack
.knapsack-ruby22
:
&knapsack-ruby22
<<
:
*knapsack
image
:
registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.2
image
:
"
ruby:2.2"
only
:
-
master
cache
:
...
...
scripts/prepare_build.sh
View file @
b09a329f
...
...
@@ -12,6 +12,20 @@ retry() {
}
if
[
-f
/.dockerenv
]
||
[
-f
./dockerinit
]
;
then
mkdir
-p
vendor
# Install phantomjs package
pushd
vendor
if
[
!
-e
phantomjs_1.9.8-0jessie_amd64.deb
]
;
then
wget
-q
https://gitlab.com/axil/phantomjs-debian/raw/master/phantomjs_1.9.8-0jessie_amd64.deb
fi
dpkg
-i
phantomjs_1.9.8-0jessie_amd64.deb
popd
# Try to install packages
retry
'apt-get update -yqqq; apt-get -o dir::cache::archives="vendor/apt" install -y -qq --force-yes \
libicu-dev libkrb5-dev cmake nodejs postgresql-client mysql-client unzip'
cp
config/database.yml.mysql config/database.yml
sed
-i
's/username:.*/username: root/g'
config/database.yml
sed
-i
's/password:.*/password:/g'
config/database.yml
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment