cody/wrestlingdev.com
1
0
Fork 0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-04-17 05:15:36 +00:00
Code Issues Releases Wiki Activity

Fixed dockerfiles for prod and dev with new frontend

Browse Source
This commit is contained in:
Jacob Cody Wimer
2016-03-09 09:09:18 -05:00
parent c8a09956f4
commit 4ae5e66b66
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rails-dev-Dockerfile
View File

@@ -3,7 +3,7 @@ FROM ruby:2.3.0
RUN apt-get update RUN apt-get update
RUN apt-get install -y build-essential RUN apt-get install -y build-essential
RUN apt-get install -y nodejs sqlite3 RUN apt-get install -y nodejs-legacy nodejs sqlite3 npm
ENV WRESTLINGDEV_SECRET_KEY_BASE 077cdbef5c2ccf22543fb17a67339f234306b7fa2e1e4463d851c444c10a5611829a2290b253da78339427f131571fac9a42c83d960b2d25ecc10a4a0a7ce1a2 ENV WRESTLINGDEV_SECRET_KEY_BASE 077cdbef5c2ccf22543fb17a67339f234306b7fa2e1e4463d851c444c10a5611829a2290b253da78339427f131571fac9a42c83d960b2d25ecc10a4a0a7ce1a2
ENV WRESTLINGDEV_DEVISE_SECRET_KEY 2f29d49db6704377ba263f7cb9db085b386bcb301c0cd501126a674686ab1a109754071165b08cd72af03cec4642a4dd04361c994462254dd5d85e9594e8b9aa ENV WRESTLINGDEV_DEVISE_SECRET_KEY 2f29d49db6704377ba263f7cb9db085b386bcb301c0cd501126a674686ab1a109754071165b08cd72af03cec4642a4dd04361c994462254dd5d85e9594e8b9aa
@@ -14,12 +14,9 @@ WORKDIR /tmp
RUN bundle install --without production RUN bundle install --without production
RUN npm install -g lineman RUN npm install -g lineman
ADD frontend/package.json /tmp/
RUN npm install
RUN mkdir /rails RUN mkdir /rails
WORKDIR /rails WORKDIR /rails
RUN cp -a /tmp/node_modules /rails/frontend/node_modules
VOLUME ["/rails"] VOLUME ["/rails"]
EXPOSE 3000 EXPOSE 3000

5
rails-prod-Dockerfile
View File

@@ -4,7 +4,7 @@ FROM ruby:2.3.0
RUN apt-get update RUN apt-get update
RUN apt-get -y upgrade 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 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 nodejs-legacy npm mysql-client postfix
#New Relic #New Relic
#RUN echo deb http://apt.newrelic.com/debian/ newrelic non-free >> /etc/apt/sources.list.d/newrelic.list #RUN echo deb http://apt.newrelic.com/debian/ newrelic non-free >> /etc/apt/sources.list.d/newrelic.list
@@ -54,6 +54,7 @@ RUN bundle install --without test
WORKDIR /tmp WORKDIR /tmp
COPY frontend/package.json package.json COPY frontend/package.json package.json
RUN npm install RUN npm install
RUN npm install -g lineman
# Copy site into place. # Copy site into place.
RUN rm -rf /var/www RUN rm -rf /var/www
@@ -79,7 +80,7 @@ RUN echo PassengerMinInstances 3 >> /etc/apache2/apache2.conf
RUN echo PassengerPreStart *:443 >> /etc/apache2/apache2.conf RUN echo PassengerPreStart *:443 >> /etc/apache2/apache2.conf
#Copy node_modules to /var/www #Copy node_modules to /var/www
RUN cp -a /tmp/node_modules /var/www/frontend/node_modules RUN mv /tmp/node_modules /var/www/frontend/node_modules
# By default, simply start apache. # By default, simply start apache.
CMD /usr/sbin/apache2ctl -D FOREGROUND CMD /usr/sbin/apache2ctl -D FOREGROUND