Dockerfile in fat_free_crm-0.18.2 vs Dockerfile in fat_free_crm-0.19.0
- old
+ new
@@ -1,20 +1,51 @@
# Usage:
+# docker volume create pgdata
+# docker volume create gems
# docker-compose up
-# docker-compose exec web bundle exec rake db:create db:schema:load ffcrm:demo:load assets:precompile
+# docker-compose exec web bundle exec rake db:create db:schema:load ffcrm:demo:load
-FROM phusion/passenger-ruby24
-MAINTAINER Steve Kenworthy
+FROM ruby:2.4
+LABEL author="Steve Kenworthy"
+
ENV HOME /home/app
-ADD . /home/app
-WORKDIR /home/app
+RUN mkdir -p $HOME
-RUN apt-get update \
- && apt-get install -y imagemagick firefox \
- && apt-get autoremove -y \
- && cp config/database.postgres.docker.yml config/database.yml \
- && chown -R app:app /home/app \
- && rm -f /etc/service/nginx/down /etc/nginx/sites-enabled/default \
- && cp .docker/nginx/sites-enabled/ffcrm.conf /etc/nginx/sites-enabled/ffcrm.conf \
- && bundle install --deployment
+WORKDIR $HOME
+
+ADD . $HOME
+RUN apt-get update && \
+ apt-get install -y imagemagick tzdata && \
+ apt-get autoremove -y && \
+ cp config/database.postgres.docker.yml config/database.yml && \
+ gem install bundler && \
+ bundle install --deployment && \
+ bundle exec rails assets:precompile
+
+CMD ["bundle","exec","rails","s"]
+
+EXPOSE 3000
+
+# # Usage:
+# # docker volume create pgdata
+# # docker volume create gems
+# # docker-compose up
+# # docker-compose exec web bundle exec rake db:create db:schema:load ffcrm:demo:load assets:precompile
+
+# FROM phusion/passenger-ruby24
+# MAINTAINER Steve Kenworthy
+
+# ENV HOME /home/app
+
+# ADD . /home/app
+# WORKDIR /home/app
+
+# RUN apt-get update \
+# && apt-get install -y imagemagick firefox tzdata \
+# && apt-get autoremove -y \
+# && cp config/database.postgres.docker.yml config/database.yml \
+# && chown -R app:app /home/app \
+# && rm -f /etc/service/nginx/down /etc/nginx/sites-enabled/default \
+# && cp .docker/nginx/sites-enabled/ffcrm.conf /etc/nginx/sites-enabled/ffcrm.conf \
+# && bundle install --deployment