From c8a09956f442bfa83641b8df96b8136e68ef9811 Mon Sep 17 00:00:00 2001 From: Jacob Cody Wimer Date: Thu, 3 Mar 2016 09:56:24 -0500 Subject: [PATCH] Revert "Using a more lightweight image and using rvm for ruby" This reverts commit 621813a015c2f94d9b9fdd7a74d66e6f064c1b6d. I could not get the lightweight docker image working correctly with rvm. I will most likely switch back to this image in the future when I have more time to work on it. --- rails-dev-Dockerfile | 14 ++------------ rails-prod-Dockerfile | 17 ++++++++--------- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/rails-dev-Dockerfile b/rails-dev-Dockerfile index 4075fc3..e34c624 100644 --- a/rails-dev-Dockerfile +++ b/rails-dev-Dockerfile @@ -1,23 +1,13 @@ -FROM phusion/baseimage -ENV RUBYVERSION 2.3.0 +FROM ruby:2.3.0 RUN apt-get update RUN apt-get install -y build-essential -RUN apt-get install -y nodejs sqlite3 curl +RUN apt-get install -y nodejs sqlite3 ENV WRESTLINGDEV_SECRET_KEY_BASE 077cdbef5c2ccf22543fb17a67339f234306b7fa2e1e4463d851c444c10a5611829a2290b253da78339427f131571fac9a42c83d960b2d25ecc10a4a0a7ce1a2 ENV WRESTLINGDEV_DEVISE_SECRET_KEY 2f29d49db6704377ba263f7cb9db085b386bcb301c0cd501126a674686ab1a109754071165b08cd72af03cec4642a4dd04361c994462254dd5d85e9594e8b9aa -#Install ruby -RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 -RUN \curl -sSL https://get.rvm.io | bash -s stable -RUN source /usr/local/rvm/scripts/rvm -RUN rvm install $RUBYVERSION -RUN rvm rvm --default use $RUBYVERSION -ENV PATH /usr/local/rvm/bin:$PATH - - RUN gem install --no-rdoc --no-ri bundler ADD Gemfile* /tmp/ WORKDIR /tmp diff --git a/rails-prod-Dockerfile b/rails-prod-Dockerfile index a0b4be6..7570a87 100644 --- a/rails-prod-Dockerfile +++ b/rails-prod-Dockerfile @@ -1,18 +1,17 @@ -FROM phusion/baseimage -ENV RUBYVERSION 2.3.0 +FROM ruby:2.3.0 + RUN apt-get update RUN apt-get -y upgrade RUN DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential libssl-dev libyaml-dev libreadline-dev openssl curl git-core zlib1g-dev bison libxml2-dev libxslt1-dev libcurl4-openssl-dev libsqlite3-dev sqlite3 wget apache2 apt-transport-https nodejs mysql-client postfix -#Install ruby -RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 -RUN \curl -sSL https://get.rvm.io | bash -s stable -RUN source /usr/local/rvm/scripts/rvm -RUN rvm install $RUBYVERSION -RUN rvm rvm --default use $RUBYVERSION -ENV PATH /usr/local/rvm/bin:$PATH +#New Relic +#RUN echo deb http://apt.newrelic.com/debian/ newrelic non-free >> /etc/apt/sources.list.d/newrelic.list +#RUN wget -O- https://download.newrelic.com/548C16BF.gpg | apt-key add - +#RUN apt-get update +#RUN apt-get install newrelic-sysmond -y +#RUN nrsysmond-config --set license_key=$NEW_RELIC_LICENSE_KEY #Passenger RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 561F9B9CAC40B2F7