Skip to content

Commit c383ff4

Browse files
committed
Switch from Debian Wheezy to Phusion Passenger base container
1 parent 5da5d5b commit c383ff4

File tree

3 files changed

+41
-47
lines changed

3 files changed

+41
-47
lines changed

Dockerfile

+24-47
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,30 @@
1-
FROM debian:wheezy
1+
FROM phusion/passenger-ruby21
22

33
MAINTAINER Concerto Authors "team@concerto-signage.org"
44

5-
RUN echo "deb http://ftp.us.debian.org/debian wheezy-backports main" >> /etc/apt/sources.list
6-
7-
RUN apt-get update -qq && \
8-
apt-get -yqq install -y build-essential git-core imagemagick nodejs ruby1.9.1-full && \
9-
apt-get -yqq install -y libmysqlclient18 librmagick-ruby libruby1.9.1 libpq5 && \
10-
apt-get -yqq install -y zlib1g-dev libmagickcore-dev libmagickwand-dev libsqlite3-dev libmysqlclient-dev libpq-dev libxslt-dev libssl-dev && \
11-
apt-get install -y libreoffice
12-
13-
RUN adduser --disabled-password --home=/concerto --gecos "Concerto User" concerto && \
14-
mkdir /concerto/rails-root && \
15-
chown concerto:concerto /concerto/rails-root
16-
COPY app /concerto/rails-root/app
17-
COPY bin /concerto/rails-root/bin
18-
COPY config /concerto/rails-root/config
19-
COPY db /concerto/rails-root/db
20-
COPY doc /concerto/rails-root/doc
21-
COPY lib /concerto/rails-root/lib
22-
COPY public /concerto/rails-root/public
23-
COPY script /concerto/rails-root/script
24-
COPY test /concerto/rails-root/test
25-
COPY tools /concerto/rails-root/tools
26-
COPY vendor /concerto/rails-root/vendor
27-
COPY .git /concerto/rails-root/.git
28-
COPY ./.gitignore /concerto/rails-root/
29-
COPY ./.gitmodules /concerto/rails-root/
30-
COPY ./.simplecov /concerto/rails-root/
31-
COPY ./Gemfile /concerto/rails-root/
32-
COPY ./Gemfile-plugins /concerto/rails-root/
33-
COPY ./Gemfile-reporting /concerto/rails-root/
34-
COPY ./Gemfile.lock /concerto/rails-root/
35-
COPY ./Procfile /concerto/rails-root/
36-
COPY ./Rakefile /concerto/rails-root/
37-
COPY ./config.ru /concerto/rails-root/
38-
RUN chown -R concerto /concerto/
39-
40-
USER concerto
41-
WORKDIR /concerto/rails-root/
42-
RUN git submodule update --init --recursive && \
43-
gem install bundler --user-install && \
44-
~/.gem/ruby/1.9.1/bin/bundle install --deployment
5+
ENV HOME /root
6+
CMD ["/sbin/my_init"]
457

46-
USER root
47-
RUN apt-get autoremove && \
48-
apt-get clean
8+
RUN rm -f /etc/service/nginx/down
9+
RUN rm /etc/nginx/sites-enabled/default
10+
11+
COPY tools/nginx.docker.conf /etc/nginx/sites-enabled/concerto.conf
12+
13+
RUN mkdir /home/app/concerto
4914

50-
USER concerto
51-
VOLUME ["/concerto/rails-root/doc", "/concerto/rails-root/log", "/concerto/rails-root/tmp"]
15+
WORKDIR /tmp
16+
COPY Gemfile /tmp/
17+
COPY Gemfile-reporting /tmp/
18+
COPY Gemfile-plugins /tmp/
19+
COPY Gemfile.lock /tmp/
20+
COPY lib/command_check_docker.rb /tmp/lib/command_check.rb
21+
RUN bundle install
22+
COPY . /home/app/concerto
5223

53-
ENTRYPOINT ["/bin/sh", "-c", "cd /concerto/rails-root && rake test"]
24+
USER app
25+
WORKDIR /home/app/concerto
26+
RUN git submodule update --init --recursive
27+
28+
RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
29+
30+
USER root

lib/command_check_docker.rb

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
def system_has_mysql?
2+
true
3+
end
4+
5+
def system_has_postgres?
6+
true
7+
end

tools/nginx.docker.conf

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
server {
2+
listen 80;
3+
server_name localhost;
4+
root /home/app/concerto/public;
5+
6+
passenger_enabled on;
7+
passenger_user app;
8+
9+
passenger_ruby /usr/bin/ruby2.1;
10+
}

0 commit comments

Comments
 (0)