Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Dockerfile #4

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update Dockerfile #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bd2ebc
Update Dockerfile
combatmonk Apr 13, 2016
69c2d90
Adding try catch to startserver.sh
combatmonk Apr 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ RUN echo "daemon off;" >> /etc/nginx/nginx.conf
RUN git clone https://github.com/Netflix/scumblr.git /scumblr

# Install rvm, ruby, bundler, sidekiq
RUN curl -sSL https://rvm.io/mpapis.asc | gpg --import
RUN curl -sSL https://get.rvm.io | bash -s stable
RUN /bin/bash -l -c "rvm requirements"
RUN /bin/bash -l -c "rvm install 2.0.0-p481"
Expand Down
10 changes: 8 additions & 2 deletions scripts/start-server.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,15 @@

source /etc/profile.d/rvm.sh

git clone https://github.com/Netflix/scumblr.git /scumblr
{ # your 'try' block
git clone https://github.com/Netflix/scumblr.git /scumblr &&
mv output
} || { # your 'catch' block
mv log
}

rm tmp cd /scumblr

cd /scumblr

if [ "$SCUMBLR_CREATE_DB" == "true" ]
then
Expand Down