From 63595954a18272dbe186b33e8d8e9ba6a621c018 Mon Sep 17 00:00:00 2001 From: Jacob Cody Wimer Date: Wed, 31 May 2017 12:43:31 -0400 Subject: [PATCH] Needed to add a js library to dev and prod docker images --- Gemfile.lock | 9 +-------- rails-dev-Dockerfile | 2 +- rails-prod-Dockerfile | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d05943c..809fbf7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -97,9 +97,6 @@ GEM parallel (1.11.2) parser (2.4.0.0) ast (~> 2.2) - passenger (5.1.4) - rack - rake (>= 0.8.1) powerpack (0.1.1) puma (3.8.2) rack (1.6.8) @@ -124,8 +121,6 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - rails-lineman (0.3.0) - rake rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging @@ -199,10 +194,8 @@ DEPENDENCIES jquery-rails mysql2 newrelic_rpm - passenger puma rails (= 4.2.5) - rails-lineman rails_12factor rb-readline round_robin_tournament @@ -218,4 +211,4 @@ RUBY VERSION ruby 2.3.0p0 BUNDLED WITH - 1.14.6 + 1.15.0 diff --git a/rails-dev-Dockerfile b/rails-dev-Dockerfile index 12c1525..c684759 100644 --- a/rails-dev-Dockerfile +++ b/rails-dev-Dockerfile @@ -3,7 +3,7 @@ FROM ruby:2.3.0 RUN apt-get update RUN apt-get install -y build-essential -RUN apt-get install -y sqlite3 +RUN apt-get install -y sqlite3 nodejs ENV WRESTLINGDEV_SECRET_KEY_BASE 077cdbef5c2ccf22543fb17a67339f234306b7fa2e1e4463d851c444c10a5611829a2290b253da78339427f131571fac9a42c83d960b2d25ecc10a4a0a7ce1a2 ENV WRESTLINGDEV_DEVISE_SECRET_KEY 2f29d49db6704377ba263f7cb9db085b386bcb301c0cd501126a674686ab1a109754071165b08cd72af03cec4642a4dd04361c994462254dd5d85e9594e8b9aa diff --git a/rails-prod-Dockerfile b/rails-prod-Dockerfile index 01e98dd..1820999 100644 --- a/rails-prod-Dockerfile +++ b/rails-prod-Dockerfile @@ -3,7 +3,7 @@ FROM ruby:2.3.0 RUN apt-get clean && 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 apt-transport-https mysql-client postfix +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 apt-transport-https mysql-client postfix nodejs #New Relic #RUN echo deb http://apt.newrelic.com/debian/ newrelic non-free >> /etc/apt/sources.list.d/newrelic.list