Skip to content

Commit c17e218

Browse files
committed
Rebuilt the Coderwall basebox to fix several issues related to db not being ready and missing dependencies. Upgraded to Ruby 2.1.5. Added PhantomJS.
1 parent 8b75c52 commit c17e218

File tree

9 files changed

+231
-247
lines changed

9 files changed

+231
-247
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ tmp
4848
vagrant/cache
4949
vagrant/coderwall-box/output-virtualbox-iso/
5050
vagrant/coderwall-box/packer_cache/
51-
vagrant/coderwall-box/packer_virtualbox-iso_virtualbox.box
51+
vagrant/coderwall-box/*.box
5252
vagrant/dotfiles
5353
erd.pdf
5454
vagrant.yml

.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.4
1+
ruby

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: ruby
22
rvm:
3-
- 2.1.4
3+
- 2.1.5
44
bundler_args: "--without development production autotest"
55
services:
66
- mongodb

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM whatupdave/ruby:2.1.4
1+
FROM whatupdave/ruby:2.1.5
22

33
RUN apt-get update -qq && apt-get install -y nodejs
44

@@ -9,4 +9,4 @@ COPY Gemfile Gemfile
99
COPY Gemfile.lock Gemfile.lock
1010
RUN bundle install
1111

12-
ADD . /app
12+
ADD . /app

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source 'https://rubygems.org'
22
source 'https://rails-assets.org'
33

4-
ruby '2.1.4'
4+
ruby '2.1.5'
55

66
gem 'rails', '~> 3.2'
77

vagrant/bootstrap.sh

-56
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,6 @@
11
#!/bin/bash -x
22
export DEBIAN_FRONTEND=noninteractive
33

4-
apt-get -y install ack-grep
5-
apt-get -y install autoconf
6-
apt-get -y install automake
7-
apt-get -y install bash
8-
apt-get -y install bison
9-
apt-get -y install build-essential
10-
apt-get -y install bzip2
11-
apt-get -y install ca-certificates
12-
apt-get -y install curl
13-
apt-get -y install g++
14-
apt-get -y install gawk
15-
apt-get -y install gcc
16-
apt-get -y install git-core
17-
apt-get -y install htop
18-
apt-get -y install imagemagick
19-
apt-get -y install iotop
20-
apt-get -y install libc6-dev
21-
apt-get -y install libcurl3
22-
apt-get -y install libcurl3-dev
23-
apt-get -y install libcurl3-gnutls
24-
apt-get -y install libcurl4-openssl-dev
25-
apt-get -y install libffi-dev
26-
apt-get -y install libgdbm-dev
27-
apt-get -y install libmagickcore-dev
28-
apt-get -y install libmagickwand-dev
29-
apt-get -y install libncurses5-dev
30-
apt-get -y install libopenssl-ruby
31-
apt-get -y install libpq-dev
32-
apt-get -y install libreadline6
33-
apt-get -y install libreadline6-dev
34-
apt-get -y install libsqlite3-0
35-
apt-get -y install libsqlite3-dev
36-
apt-get -y install libssl-dev
37-
apt-get -y install libtool
38-
apt-get -y install libxml2
39-
apt-get -y install libxml2-dev
40-
apt-get -y install libxslt-dev
41-
apt-get -y install libxslt1-dev
42-
apt-get -y install libyaml-dev
43-
apt-get -y install make
44-
apt-get -y install nfs-common
45-
apt-get -y install openssl
46-
apt-get -y install patch
47-
apt-get -y install pep8
48-
apt-get -y install pkg-config
49-
apt-get -y install portmap
50-
apt-get -y install python-dev
51-
apt-get -y install python-setuptools
52-
apt-get -y install sqlite3
53-
apt-get -y install tcl8.5
54-
apt-get -y install tmux
55-
apt-get -y install vim
56-
apt-get -y install zlib1g
57-
apt-get -y install zlib1g-dev
58-
594
# Ensure the database is started
605
su -c '/usr/bin/pg_ctl start -l /var/pgsql/data/log/logfile -D /var/pgsql/data' postgres
616

@@ -65,5 +10,4 @@ su - vagrant <<-'EOF'
6510
# Force the app to use the internal Postgres port number and ignore .env
6611
bundle exec rake db:migrate
6712
bundle exec rake db:test:prepare
68-
6913
EOF

0 commit comments

Comments
 (0)