discourse
/
discourse_docker
mirror of https://github.com/discourse/discourse_docker.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upgrade rubies, get ready for new image

This commit is contained in:
Sam 2015-09-22 11:56:22 +10:00
parent 7439768eb0
commit 1ed6730f60
6 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
cids/.gitkeep
View File

7
image/base/Dockerfile
View File

@ -2,7 +2,7 @@
# When new LTS ships we can upgrade # When new LTS ships we can upgrade
# NAME: discourse_base # NAME: discourse_base
# VERSION: 1.0.12 # VERSION: 1.0.13
FROM ubuntu:14.04 FROM ubuntu:14.04
@ -84,7 +84,7 @@ RUN add-apt-repository ppa:ubuntu-toolchain-r/test &&\
echo 'gem: --no-document' >> /usr/local/etc/gemrc &&\ echo 'gem: --no-document' >> /usr/local/etc/gemrc &&\
mkdir /src && cd /src && git clone https://github.com/sstephenson/ruby-build.git &&\ mkdir /src && cd /src && git clone https://github.com/sstephenson/ruby-build.git &&\
cd /src/ruby-build && ./install.sh &&\ cd /src/ruby-build && ./install.sh &&\
cd / && rm -rf /src/ruby-build && ruby-build 2.0.0-p645 /usr/local &&\ cd / && rm -rf /src/ruby-build && ruby-build 2.0.0-p647 /usr/local &&\
gem update --system &&\ gem update --system &&\
gem install bundler &&\ gem install bundler &&\
rm -rf /usr/local/share/ri/2.0.0/system &&\ rm -rf /usr/local/share/ri/2.0.0/system &&\
@ -102,6 +102,3 @@ ADD boot /sbin/boot
ADD cron /etc/service/cron/run ADD cron /etc/service/cron/run
ADD rsyslog /etc/service/rsyslog/run ADD rsyslog /etc/service/rsyslog/run
# this is temporary, remove in 2015
RUN cp /sbin/boot /sbin/runit

16
image/base_22/Dockerfile
View File

@ -1,16 +0,0 @@
# Official repo only has a ppa for postgresql 9.3 at the moment (14/3/2014)
# When new LTS ships we can upgrade
# VERSION 1.0.12
FROM samsaffron/discourse_base:1.0.12
MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
RUN apt-get -y install ruby bison autoconf &&\
echo install_package "openssl-1.0.1l" "https://www.openssl.org/source/openssl-1.0.1l.tar.gz#b2cf4d48fe5d49f240c61c9e624193a6f232b5ed0baf010681e725963c40d1d4" mac_openssl --if has_broken_mac_openssl > /src/2.2.2-github &&\
echo install_package "ruby-2.2.2-github" "https://github.com/SamSaffron/ruby/archive/2.2.2-github.tar.gz#46aeee28ead1038cf615b17672ad6e54" autoconf ldflags_dirs standard verify_openssl >> /src/2.2.2-github &&\
ruby-build /src/2.2.2-github /usr/local &&\
apt-get -y remove ruby &&\
gem update --system &&\
gem install bundler &&\
rm -fr /src/ruby-build

2
image/build.rb
View File

@ -2,7 +2,7 @@
# #
require 'pty' require 'pty'
$version = "1.0.12" $version = "1.0.13"
$docker_squash = "https://github.com/jwilder/docker-squash/releases/download/v0.0.11/docker-squash-linux-amd64-v0.0.11.tar.gz" $docker_squash = "https://github.com/jwilder/docker-squash/releases/download/v0.0.11/docker-squash-linux-amd64-v0.0.11.tar.gz"

4
image/discourse/Dockerfile
View File

@ -1,5 +1,5 @@
# Current version 1.0.12 # Current version 1.0.13
FROM samsaffron/discourse_base:1.0.12 FROM samsaffron/discourse_base:1.0.13
MAINTAINER Sam Saffron "https://twitter.com/samsaffron" MAINTAINER Sam Saffron "https://twitter.com/samsaffron"

10
image/discourse_fast_switch/Dockerfile
View File

@ -1,16 +1,16 @@
# Allow to easily switch Ruby version in images that derive off this # Allow to easily switch Ruby version in images that derive off this
FROM samsaffron/discourse:1.0.12 FROM samsaffron/discourse:1.0.13
MAINTAINER Sam Saffron "https://twitter.com/samsaffron" MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
RUN apt-get -y install ruby bison autoconf &&\ RUN apt-get -y install ruby bison autoconf &&\
echo install_package "openssl-1.0.1l" "https://www.openssl.org/source/openssl-1.0.1l.tar.gz#b2cf4d48fe5d49f240c61c9e624193a6f232b5ed0baf010681e725963c40d1d4" mac_openssl --if has_broken_mac_openssl > /src/2.2.2-github &&\ echo install_package "openssl-1.0.1l" "https://www.openssl.org/source/openssl-1.0.1l.tar.gz#b2cf4d48fe5d49f240c61c9e624193a6f232b5ed0baf010681e725963c40d1d4" mac_openssl --if has_broken_mac_openssl > /src/2.2.3-github &&\
echo install_package "ruby-2.2.2-github" "https://github.com/SamSaffron/ruby/archive/2.2.2-github.tar.gz#46aeee28ead1038cf615b17672ad6e54" autoconf ldflags_dirs standard verify_openssl >> /src/2.2.2-github &&\ echo install_package "ruby-2.2.3-github" "https://github.com/SamSaffron/ruby/archive/2.2.3-github.tar.gz#46aeee28ead1038cf615b17672ad6e54" autoconf ldflags_dirs standard verify_openssl >> /src/2.2.3-github &&\
ruby-build /src/2.2.2-github /usr/ruby_22 &&\ ruby-build /src/2.2.3-github /usr/ruby_22 &&\
apt-get -y remove ruby apt-get -y remove ruby
RUN cd / && rm -rf /src/ruby-build && ruby-build 2.0.0-p643 /usr/ruby_20 RUN cd / && rm -rf /src/ruby-build && ruby-build 2.0.0-p647 /usr/ruby_20
ADD create_switch.rb /src/create_switch.rb ADD create_switch.rb /src/create_switch.rb
RUN ruby /src/create_switch.rb RUN ruby /src/create_switch.rb