Skip to content

Commit abdbc67

Browse files
author
Ben Visser
committed
updating
1 parent 885baf2 commit abdbc67

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Dockerfile

+4-3
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ RUN apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 573BFD6B3D8FBC64107
1313
&& apt-get install -qq -y nginx=1.10.2-1~jessie
1414

1515
# install foreman
16-
RUN gem install foreman \
17-
&& gem install unicorn
16+
RUN gem install foreman
1817

1918
# install the latest postgresql lib for pg gem
2019
RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
@@ -39,11 +38,13 @@ ONBUILD ADD Gemfile /app/Gemfile
3938
ONBUILD ADD Gemfile.lock /app/Gemfile.lock
4039
ONBUILD RUN bundle install --without development test
4140
ONBUILD ADD . /app
42-
ONBUILD RUN bundle exec rake assets:precompile
4341

4442
ADD nginx-sites.conf /etc/nginx/sites-enabled/default
4543
ADD nginx.conf /etc/nginx/nginx.conf
4644
ADD unicorn.rb /app/config/unicorn.rb
4745
ADD Procfile /app/Procfile
4846

47+
# ADD server.crt /etc/nginx/ssl/server.crt
48+
# ADD server.key /etc/nginx/ssl/server.key
49+
4950
CMD foreman start -f Procfile

nginx.conf

-1
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,3 @@ http {
4343

4444
include /etc/nginx/sites-enabled/*;
4545
}
46-

0 commit comments

Comments
 (0)