@@ -5,16 +5,22 @@ MAINTAINER Jay Luker <jay_luker@harvard.edu>
55ENV POSTGRES_VERSION 9.3
66ENV RAILS_ENV development
77
8+ # enable https repos and add in nodesource repo
9+ RUN apt-get -y install apt-transport-https
10+ ADD assets/nodesource.list /etc/apt/sources.list.d/nodesource.list
11+ ADD https://deb.nodesource.com/gpgkey/nodesource.gpg.key /tmp/nodesource.gpg.key
12+ RUN apt-key add /tmp/nodesource.gpg.key
13+
814# add nodejs and recommended ruby repos
915RUN apt-get update \
1016 && apt-get -y install software-properties-common python-software-properties \
11- && add-apt-repository ppa:chris-lea/node.js \
1217 && add-apt-repository ppa:brightbox/ppa \
18+ && add-apt-repository ppa:brightbox/ruby-ng \
1319 && apt-get update
1420
1521# install deps for building/running canvas
1622RUN apt-get install -y \
17- ruby1.9.3 zlib1g-dev libxml2-dev libxslt1-dev \
23+ ruby2.1 ruby2.1-dev zlib1g-dev libxml2-dev libxslt1-dev \
1824 imagemagick libpq-dev libxmlsec1-dev libcurl4-gnutls-dev \
1925 libxmlsec1 build-essential openjdk-7-jre unzip curl \
2026 python g++ make git-core nodejs supervisor redis-server \
@@ -25,7 +31,7 @@ RUN apt-get install -y \
2531 && apt-get clean \
2632 && rm -Rf /var/cache/apt
2733
28- RUN gem install bundler --version 1.7.10
34+ RUN gem install bundler --version 1.10.3
2935
3036# Set the locale to avoid active_model_serializers bundler install failure
3137RUN locale-gen en_US.UTF-8
@@ -46,16 +52,16 @@ RUN cd /opt/canvas-lms \
4652 ; done
4753
4854RUN cd /opt/canvas-lms \
49- && npm install --unsafe-perm \
55+ && npm install --unsafe-perm \
5056 && bundle exec rake canvas:compile_assets
5157
52- COPY assets/database.yml /opt/canvas-lms/config/database.yml
53- COPY assets/redis.yml /opt/canvas-lms/config/redis.yml
54- COPY assets/cache_store.yml /opt/canvas-lms/config/cache_store.yml
55- COPY assets/development-local.rb /opt/canvas-lms/config/environments/development-local.rb
56- COPY assets/supervisord.conf /etc/supervisor/supervisord.conf
57- COPY assets/dbinit.sh /dbinit.sh
58- COPY assets/dbconf.sh /dbconf.sh
58+ ADD assets/database.yml /opt/canvas-lms/config/database.yml
59+ ADD assets/redis.yml /opt/canvas-lms/config/redis.yml
60+ ADD assets/cache_store.yml /opt/canvas-lms/config/cache_store.yml
61+ ADD assets/development-local.rb /opt/canvas-lms/config/environments/development-local.rb
62+ ADD assets/supervisord.conf /etc/supervisor/supervisord.conf
63+ ADD assets/dbinit.sh /dbinit.sh
64+ ADD assets/dbconf.sh /dbconf.sh
5965RUN chmod 755 /dbconf.sh /dbinit.sh
6066
6167RUN /dbconf.sh && service postgresql start && /dbinit.sh
0 commit comments